Merge pull request #53 from christopherhein/feature/52-resourcename

Adding Support For ResourceName w/ Dynamo & S3buckets
amazon-archives · Aug 25, 2018 · 2b52f3a · 2b52f3a
2 parents ee15428 + 0b174a4
commit 2b52f3a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/examples/dynamodb.yaml b/examples/dynamodb.yaml
@@ -3,7 +3,6 @@ kind: DynamoDB
 metadata:
   name: dynamodb-table
 spec:
-  tableName: dynamodb-table
   hashAttribute:
     name: user_id
     type: S

diff --git a/examples/s3bucket.yaml b/examples/s3bucket.yaml
@@ -3,7 +3,6 @@ kind: S3Bucket
 metadata:
   name: chrishein-test-bucket-109
 spec:
-  bucketName: chrishein-test-bucket-name-109
   versioning: false
   logging:
     enabled: false

diff --git a/models/dynamodb.yaml b/models/dynamodb.yaml
@@ -22,7 +22,7 @@ spec:
       type: object
       properties:
       - key: tableName
-        type: string
+        type: resourceName
         description: |
           TableName is the name of the DynamoDB Table to be created.
         structKey: TableName

diff --git a/models/s3bucket.yaml b/models/s3bucket.yaml
@@ -19,7 +19,7 @@ spec:
       type: object
       properties:
       - key: bucketName
-        type: string
+        type: resourceName
         description: |
           BucketName is the name of the S3 Bucket to be created.
         structKey: BucketName

diff --git a/pkg/operator/dynamodb/cft.go b/pkg/operator/dynamodb/cft.go
@@ -75,7 +75,7 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput
 	resourceVersion := helpers.CreateParam("ResourceVersion", s.DynamoDB.ResourceVersion)
 	namespace := helpers.CreateParam("Namespace", s.DynamoDB.Namespace)
 	clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName)
-	tableName := helpers.CreateParam("TableName", helpers.Stringify(s.DynamoDB.Spec.TableName))
+	tableName := helpers.CreateParam("TableName", helpers.Stringify(s.DynamoDB.Name))
   rangeAttributeName := helpers.CreateParam("RangeAttributeName", helpers.Stringify(s.DynamoDB.Spec.RangeAttribute.Name))
   rangeAttributeType := helpers.CreateParam("RangeAttributeType", helpers.Stringify(s.DynamoDB.Spec.RangeAttribute.Type))
 	readCapacityUnits := helpers.CreateParam("ReadCapacityUnits", helpers.Stringify(s.DynamoDB.Spec.ReadCapacityUnits))
@@ -134,7 +134,7 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.DynamoDB) (output *clo
 	resourceVersion := helpers.CreateParam("ResourceVersion", s.DynamoDB.ResourceVersion)
 	namespace := helpers.CreateParam("Namespace", s.DynamoDB.Namespace)
 	clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName)
-	tableName := helpers.CreateParam("TableName", helpers.Stringify(updated.Spec.TableName))
+	tableName := helpers.CreateParam("TableName", helpers.Stringify(s.DynamoDB.Name))
 	rangeAttributeName := helpers.CreateParam("RangeAttributeName", helpers.Stringify(updated.Spec.RangeAttribute.Name))
 	rangeAttributeType := helpers.CreateParam("RangeAttributeType", helpers.Stringify(updated.Spec.RangeAttribute.Type))
 	readCapacityUnits := helpers.CreateParam("ReadCapacityUnits", helpers.Stringify(updated.Spec.ReadCapacityUnits))

diff --git a/pkg/operator/s3bucket/cft.go b/pkg/operator/s3bucket/cft.go
@@ -75,7 +75,7 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput
 	resourceVersion := helpers.CreateParam("ResourceVersion", s.S3Bucket.ResourceVersion)
 	namespace := helpers.CreateParam("Namespace", s.S3Bucket.Namespace)
 	clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName)
-	bucketName := helpers.CreateParam("BucketName", helpers.Stringify(s.S3Bucket.Spec.BucketName))
+	bucketName := helpers.CreateParam("BucketName", helpers.Stringify(s.S3Bucket.Name))
 	versioning := helpers.CreateParam("EnableVersioning", helpers.Stringify(s.S3Bucket.Spec.Versioning))
   loggingenabled := helpers.CreateParam("EnableLogging", helpers.Stringify(s.S3Bucket.Spec.Logging.Enabled))
   loggingprefix := helpers.CreateParam("LoggingPrefix", helpers.Stringify(s.S3Bucket.Spec.Logging.Prefix))
@@ -128,7 +128,7 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.S3Bucket) (output *clo
 	resourceVersion := helpers.CreateParam("ResourceVersion", s.S3Bucket.ResourceVersion)
 	namespace := helpers.CreateParam("Namespace", s.S3Bucket.Namespace)
 	clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName)
-	bucketName := helpers.CreateParam("BucketName", helpers.Stringify(updated.Spec.BucketName))
+	bucketName := helpers.CreateParam("BucketName", helpers.Stringify(s.S3Bucket.Name))
 	versioning := helpers.CreateParam("EnableVersioning", helpers.Stringify(updated.Spec.Versioning))
 	loggingenabled := helpers.CreateParam("EnableLogging", helpers.Stringify(updated.Spec.Logging.Enabled))
 	loggingprefix := helpers.CreateParam("LoggingPrefix", helpers.Stringify(updated.Spec.Logging.Prefix))