remove websites from resource index

Author: davemooreuws

cloud/aws/common/index.go

@@ -32,31 +32,27 @@ type Topic struct {
 
 // ResourceIndex - The resource index for a nitric stack
 type ResourceIndex struct {
-	Buckets        map[string]AwsResourceArn `json:"buckets"`
-	Topics         map[string]Topic          `json:"topics"`
-	KvStores       map[string]AwsResourceArn `json:"kvStores"`
-	Queues         map[string]AwsResourceArn `json:"queues"`
-	Secrets        map[string]AwsResourceArn `json:"secrets"`
-	Apis           map[string]ApiGateway     `json:"apis"`
-	HttpProxies    map[string]ApiGateway     `json:"httpProxies"`
-	Websockets     map[string]ApiGateway     `json:"websockets"`
-	Schedules      map[string]AwsResourceArn `json:"schedules"`
-	Distributions  map[string]AwsResourceArn `json:"distributions"`
-	WebsiteBuckets map[string]AwsResourceArn `json:"websiteBuckets"`
+	Buckets     map[string]AwsResourceArn `json:"buckets"`
+	Topics      map[string]Topic          `json:"topics"`
+	KvStores    map[string]AwsResourceArn `json:"kvStores"`
+	Queues      map[string]AwsResourceArn `json:"queues"`
+	Secrets     map[string]AwsResourceArn `json:"secrets"`
+	Apis        map[string]ApiGateway     `json:"apis"`
+	HttpProxies map[string]ApiGateway     `json:"httpProxies"`
+	Websockets  map[string]ApiGateway     `json:"websockets"`
+	Schedules   map[string]AwsResourceArn `json:"schedules"`
 }
 
 func NewResourceIndex() *ResourceIndex {
 	return &ResourceIndex{
-		Buckets:        make(map[string]AwsResourceName),
-		Topics:         make(map[string]Topic),
-		KvStores:       make(map[string]AwsResourceArn),
-		Queues:         make(map[string]AwsResourceArn),
-		Secrets:        make(map[string]AwsResourceArn),
-		Apis:           make(map[string]ApiGateway),
-		HttpProxies:    make(map[string]ApiGateway),
-		Websockets:     make(map[string]ApiGateway),
-		Schedules:      make(map[string]AwsResourceArn),
-		Distributions:  make(map[string]AwsResourceArn),
-		WebsiteBuckets: make(map[string]AwsResourceArn),
+		Buckets:     make(map[string]AwsResourceName),
+		Topics:      make(map[string]Topic),
+		KvStores:    make(map[string]AwsResourceArn),
+		Queues:      make(map[string]AwsResourceArn),
+		Secrets:     make(map[string]AwsResourceArn),
+		Apis:        make(map[string]ApiGateway),
+		HttpProxies: make(map[string]ApiGateway),
+		Websockets:  make(map[string]ApiGateway),
+		Schedules:   make(map[string]AwsResourceArn),
 	}
 }

cloud/aws/deploy/resources.go

@@ -83,16 +83,6 @@ func (a *NitricAwsPulumiProvider) resourcesStore(ctx *pulumi.Context) error {
 		httpProxyEndpointMap[name] = proxy.ApiEndpoint
 	}
 
-	websiteBucketArnMap := pulumi.StringMap{}
-	if a.publicWebsiteBucket != nil {
-		websiteBucketArnMap[a.websiteBucketName] = a.publicWebsiteBucket.Arn
-	}
-
-	distributionsArnMap := pulumi.StringMap{}
-	for name, distribution := range a.Distributions {
-		distributionsArnMap[name] = distribution.Arn
-	}
-
 	// Build the index from the provider information
 	resourceIndexJson := pulumi.All(
 		bucketArnMap,
@@ -107,8 +97,6 @@ func (a *NitricAwsPulumiProvider) resourcesStore(ctx *pulumi.Context) error {
 		stateMachArnMap,
 		httpProxyArnMap,
 		httpProxyEndpointMap,
-		distributionsArnMap,
-		websiteBucketArnMap,
 	).ApplyT(func(args []interface{}) (string, error) {
 		bucketNameMap := args[0].(map[string]string)
 		apiArnMap := args[1].(map[string]string)
@@ -122,8 +110,6 @@ func (a *NitricAwsPulumiProvider) resourcesStore(ctx *pulumi.Context) error {
 		stateMachArnMap := args[9].(map[string]string)
 		httpProxyArnMap := args[10].(map[string]string)
 		httpProxyEndpointMap := args[11].(map[string]string)
-		distributionsArnMap := args[12].(map[string]string)
-		websiteBucketArnMap := args[13].(map[string]string)
 
 		index := common.NewResourceIndex()
 		for name, bucket := range bucketNameMap {
@@ -170,14 +156,6 @@ func (a *NitricAwsPulumiProvider) resourcesStore(ctx *pulumi.Context) error {
 			index.Secrets[name] = arn
 		}
 
-		for name, arn := range distributionsArnMap {
-			index.Distributions[name] = arn
-		}
-
-		for name, arn := range websiteBucketArnMap {
-			index.WebsiteBuckets[name] = arn
-		}
-
 		indexJson, err := json.Marshal(index)
 		if err != nil {
 			return "", err