fix: reuse the apiSpec in memory rather than opening it again

Author: asalkeld

pkg/provider/pulumi/aws/aws.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"io/ioutil"
 	"os"
-	"path"
 
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi-aws/sdk/v4/go/aws/dynamodb"
@@ -34,7 +33,6 @@ import (
 	"github.com/nitrictech/newcli/pkg/provider/pulumi/types"
 	"github.com/nitrictech/newcli/pkg/stack"
 	"github.com/nitrictech/newcli/pkg/target"
-	"github.com/nitrictech/newcli/pkg/utils"
 )
 
 type awsProvider struct {
@@ -85,29 +83,26 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
 		}
 	}
 
-	buckets := map[string]*s3.Bucket{}
 	for k := range a.s.Buckets {
-		buckets[k], err = s3.NewBucket(ctx, k, &s3.BucketArgs{
+		_, err = s3.NewBucket(ctx, k, &s3.BucketArgs{
 			Tags: commonTags(ctx, k),
 		})
 		if err != nil {
 			return errors.WithMessage(err, "s3 bucket "+k)
 		}
 	}
 
-	queues := map[string]*sqs.Queue{}
 	for k := range a.s.Queues {
-		queues[k], err = sqs.NewQueue(ctx, k, &sqs.QueueArgs{
+		_, err = sqs.NewQueue(ctx, k, &sqs.QueueArgs{
 			Tags: commonTags(ctx, k),
 		})
 		if err != nil {
 			return errors.WithMessage(err, "sqs queue "+k)
 		}
 	}
 
-	dbs := map[string]*dynamodb.Table{}
 	for k := range a.s.Collections {
-		dbs[k], err = dynamodb.NewTable(ctx, "mytable", &dynamodb.TableArgs{
+		_, err = dynamodb.NewTable(ctx, "mytable", &dynamodb.TableArgs{
 			Attributes: dynamodb.TableAttributeArray{
 				&dynamodb.TableAttributeArgs{
 					Name: pulumi.String("_pk"),
@@ -137,13 +132,6 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
 		}
 	}
 
-	for k, s := range a.s.Sites {
-		err := a.site(ctx, k, &s)
-		if err != nil {
-			return errors.WithMessage(err, "site "+k)
-		}
-	}
-
 	authToken, err := ecr.GetAuthorizationToken(ctx, &ecr.GetAuthorizationTokenArgs{})
 	if err != nil {
 		return err
@@ -187,23 +175,16 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
 			return errors.WithMessage(err, "lambda container "+c.Name())
 		}
 	}
-	apiGateways := map[string]*ApiGateway{}
-	for k, apiFile := range a.s.Apis {
-		apiGateways[k], err = newApiGateway(ctx, k, &ApiGatewayArgs{
-			ApiFilePath:     path.Join(a.s.Path(), apiFile),
+
+	for k := range a.s.Apis {
+		_, err = newApiGateway(ctx, k, &ApiGatewayArgs{
+			OpenAPISpec:     a.s.ApiDoc(k),
 			LambdaFunctions: funcs})
 		if err != nil {
 			return errors.WithMessage(err, "gateway "+k)
 		}
 	}
 
-	for k, v := range a.s.EntryPoints {
-		err = a.entrypoint(ctx, k, &v)
-		if err != nil {
-			return errors.WithMessage(err, "entrypoint "+k)
-		}
-	}
-
 	return nil
 }
 
@@ -212,11 +193,3 @@ func (a *awsProvider) CleanUp() {
 		os.Remove(a.tmpDir)
 	}
 }
-
-func (a *awsProvider) site(ctx *pulumi.Context, name string, o interface{}) error {
-	return utils.NewNotSupportedErr("site not supported on AWS yet")
-}
-
-func (a *awsProvider) entrypoint(ctx *pulumi.Context, name string, o interface{}) error {
-	return utils.NewNotSupportedErr("entrypoint not supported on AWS yet")
-}

pkg/provider/pulumi/aws/gateway.go

@@ -24,7 +24,7 @@ import (
 )
 
 type ApiGatewayArgs struct {
-	ApiFilePath     string
+	OpenAPISpec     *openapi3.T
 	LambdaFunctions map[string]*Lambda
 }
 
@@ -42,21 +42,16 @@ func newApiGateway(ctx *pulumi.Context, name string, args *ApiGatewayArgs, opts
 		return nil, err
 	}
 
-	spec, err := openapi3.NewLoader().LoadFromFile(args.ApiFilePath)
-	if err != nil {
-		return nil, err
-	}
-
-	for k, p := range spec.Paths {
+	for k, p := range args.OpenAPISpec.Paths {
 		p.Get = awsOperation(ctx.Log, p.Get, args.LambdaFunctions)
 		p.Post = awsOperation(ctx.Log, p.Post, args.LambdaFunctions)
 		p.Patch = awsOperation(ctx.Log, p.Patch, args.LambdaFunctions)
 		p.Put = awsOperation(ctx.Log, p.Put, args.LambdaFunctions)
 		p.Delete = awsOperation(ctx.Log, p.Delete, args.LambdaFunctions)
-		spec.Paths[k] = p
+		args.OpenAPISpec.Paths[k] = p
 	}
 
-	b, err := spec.MarshalJSON()
+	b, err := args.OpenAPISpec.MarshalJSON()
 	if err != nil {
 		return nil, err
 	}

pkg/stack/types.go

@@ -168,6 +168,14 @@ func (s *Stack) SetApiDoc(name string, doc *openapi3.T) {
 	s.apiDocs[name] = doc
 }
 
+func (s *Stack) ApiDoc(name string) *openapi3.T {
+	if s.apiDocs == nil {
+		return nil
+	}
+
+	return s.apiDocs[name]
+}
+
 func FromFile(name string) (*Stack, error) {
 	yamlFile, err := ioutil.ReadFile(name)
 	if err != nil {