Adding Code Generation for Static S3 Sites

Signed-off-by: Christopher Hein <[email protected]>

Author: christopherhein

pkg/apis/operator.aws/v1alpha1/s3bucket.go

@@ -33,12 +33,21 @@ type S3BucketSpec struct {
 	Versioning                      bool            `json:"versioning"`
 	AccessControl                   string          `json:"accessControl"`
 	Logging                         S3BucketLogging `json:"logging"`
+	Website                         S3BucketWebsite `json:"website"`
+}
+
+// S3BucketWebsite defines the Website resource for S3Bucket
+type S3BucketWebsite struct {
+	Enabled   bool   `json:"enabled"`
+	IndexPage string `json:"indexPage"`
+	ErrorPage string `json:"errorPage"`
 }
 
 // S3BucketOutput defines the output resource for S3Bucket
 type S3BucketOutput struct {
 	BucketName string `json:"bucketName"`
 	BucketARN  string `json:"bucketARN"`
+	WebsiteURL string `json:"websiteURL"`
 }
 
 // S3BucketStatus holds the status of the Cloudformation template

pkg/apis/operator.aws/v1alpha1/zz_generated.deepcopy.go

@@ -105,6 +105,24 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput
 		return output, err
 	}
 	loggingprefix := helpers.CreateParam("LoggingPrefix", helpers.Stringify(loggingprefixValue))
+	websiteenabledTemp := "{{.Obj.Spec.Website.Enabled}}"
+	websiteenabledValue, err := helpers.Templatize(websiteenabledTemp, helpers.Data{Obj: s.S3Bucket, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteenabled := helpers.CreateParam("EnableStaticSite", helpers.Stringify(websiteenabledValue))
+	websiteindexPageTemp := "{{.Obj.Spec.Website.IndexPage}}"
+	websiteindexPageValue, err := helpers.Templatize(websiteindexPageTemp, helpers.Data{Obj: s.S3Bucket, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteindexPage := helpers.CreateParam("StaticSiteIndex", helpers.Stringify(websiteindexPageValue))
+	websiteerrorPageTemp := "{{.Obj.Spec.Website.ErrorPage}}"
+	websiteerrorPageValue, err := helpers.Templatize(websiteerrorPageTemp, helpers.Data{Obj: s.S3Bucket, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteerrorPage := helpers.CreateParam("StaticSiteError", helpers.Stringify(websiteerrorPageValue))
 
 	parameters := []*cloudformation.Parameter{}
 	parameters = append(parameters, resourceName)
@@ -116,6 +134,9 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput
 	parameters = append(parameters, accessControl)
 	parameters = append(parameters, loggingenabled)
 	parameters = append(parameters, loggingprefix)
+	parameters = append(parameters, websiteenabled)
+	parameters = append(parameters, websiteindexPage)
+	parameters = append(parameters, websiteerrorPage)
 
 	stackInputs.SetParameters(parameters)
 
@@ -180,6 +201,24 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.S3Bucket) (output *clo
 		return output, err
 	}
 	loggingprefix := helpers.CreateParam("LoggingPrefix", helpers.Stringify(loggingprefixValue))
+	websiteenabledTemp := "{{.Obj.Spec.Website.Enabled}}"
+	websiteenabledValue, err := helpers.Templatize(websiteenabledTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteenabled := helpers.CreateParam("EnableStaticSite", helpers.Stringify(websiteenabledValue))
+	websiteindexPageTemp := "{{.Obj.Spec.Website.IndexPage}}"
+	websiteindexPageValue, err := helpers.Templatize(websiteindexPageTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteindexPage := helpers.CreateParam("StaticSiteIndex", helpers.Stringify(websiteindexPageValue))
+	websiteerrorPageTemp := "{{.Obj.Spec.Website.ErrorPage}}"
+	websiteerrorPageValue, err := helpers.Templatize(websiteerrorPageTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()})
+	if err != nil {
+		return output, err
+	}
+	websiteerrorPage := helpers.CreateParam("StaticSiteError", helpers.Stringify(websiteerrorPageValue))
 
 	parameters := []*cloudformation.Parameter{}
 	parameters = append(parameters, resourceName)
@@ -191,6 +230,9 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.S3Bucket) (output *clo
 	parameters = append(parameters, accessControl)
 	parameters = append(parameters, loggingenabled)
 	parameters = append(parameters, loggingprefix)
+	parameters = append(parameters, websiteenabled)
+	parameters = append(parameters, websiteindexPage)
+	parameters = append(parameters, websiteerrorPage)
 
 	stackInputs.SetParameters(parameters)
 

pkg/operator/s3bucket/cft.go

@@ -216,6 +216,7 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
 		}
 		resourceCopy.Output.BucketName = outputs["BucketName"]
 		resourceCopy.Output.BucketARN = outputs["BucketArn"]
+		resourceCopy.Output.WebsiteURL = outputs["WebsiteURL"]
 	}
 
 	_, err = clientSet.S3Buckets(namespace).Update(resourceCopy)
@@ -272,6 +273,7 @@ func syncAdditionalResources(config *config.Config, s *awsV1alpha1.S3Bucket) (er
 		"serviceName": "{{call .Helpers.KubernetesResourceName .Obj.Name}}",
 		"region":      "{{.Config.Region}}",
 		"bucketURL":   "{{.Obj.Name}}.s3-{{.Config.Region}}.amazonaws.com",
+		"websiteURL":  "{{.Obj.Output.WebsiteURL}}",
 	}
 	s3BucketCM := helpers.CreateConfigMap(config, s, s.Name, s.Namespace, s3BucketCMData)
 	configmaps = append(configmaps, s3BucketCM)