fix: update lambda templates to resolve build issues (#15)

* fix: update lambda templates to resolve build issues * fix: resolve nix syntax errors * fix: resolve openapi issues * fix: update template to keep tests
ALT-F4-LLC · May 7, 2024 · fdf9795 · fdf9795
1 parent edb8cc4
commit fdf9795
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/internal/config/openapi.go b/internal/config/openapi.go
@@ -1,11 +1,13 @@
 package config
 
 type OpenAPIConfig struct {
-	Enable bool `json:"enable" yaml:"enable"`
+	Enable   bool   `json:"enable" yaml:"enable"`
+	Filename string `json:"filename" yaml:"filename"`
 }
 
 func NewOpenAPIConfig() OpenAPIConfig {
 	return OpenAPIConfig{
-		Enable: false,
+		Enable:   false,
+		Filename: "openapi.json",
 	}
 }
diff --git a/internal/templates/templates/go-lambda/justfile b/internal/templates/templates/go-lambda/justfile
@@ -55,11 +55,11 @@ deploy-all environment:
     {{- end }}
 
 {{ if .OpenAPI.Enable -}}
-build-client:
+build-client{{ if .PrivateModules }} netrc="/tmp/.netrc=/tmp/.netrc"{{ end }}:
     #!/usr/bin/env bash
     DERIVATION=$(just build client "{{"{{"}} netrc {{"}}"}}")
     OUTPUT=$(echo $DERIVATION | jq -r ".[0].outputs.out")
+    mkdir -p pkg
     rm -rf pkg/client
     cp -r --no-preserve=mode $OUTPUT pkg/client
-    git add pkg/client
 {{- end }}
diff --git a/internal/templates/templates/go-lambda/nix__client.nix b/internal/templates/templates/go-lambda/nix__client.nix
@@ -7,11 +7,10 @@ runCommand "client"
   mkdir -p $out
 
   openapi-generator-cli generate \
-    -i $src/openapi.yaml \
+    -i $src/{{ .OpenAPI.Filename }} \
     -g go \
     -o $out \
-    -p packageName="client" \
-    -p packageVersion="0.1.0"
+    -p packageName="client"
 
   rm -rf \
     $out/.gitignore \
@@ -21,6 +20,5 @@ runCommand "client"
     $out/README.md \
     $out/api \
     $out/docs \
-    $out/git_push.sh \
-    $out/test
-'';
+    $out/git_push.sh
+''
diff --git a/internal/templates/templates/go-lambda/nix__lambda.nix b/internal/templates/templates/go-lambda/nix__lambda.nix
@@ -4,6 +4,7 @@
   {{ .Nix.BuildGoModule }},
   name,
   runCommand,
+  zip
 }:
 
 let
@@ -14,7 +15,7 @@ let
     src = ../.;
     subPackages = ["cmd/${name}"];
     tags = ["lambda.norpc"];
-    vendorHash = "";
+    vendorHash = "{{ .Nix.VendorHash }}";
 
     preBuild = ''
       export HOME=/tmp
@@ -30,4 +31,4 @@ let
 in
   pkg.overrideAttrs (final: {
     passthru.bootstrap = bootstrap;
-  });
+  })