currentModel behaves differently in local and when deployed (#211)

* Fix real world issue not found in testing

* Updates to fix time offset as well

resources/Time_Offset/cmd/resource/resource.go

@@ -1,6 +1,7 @@
 package resource
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
@@ -47,9 +48,10 @@ func Create(req handler.Request, _ *Model, currentModel *Model) (handler.Progres
 	// Save the unique identifier in SSM if it exists its a duplicate
 	ssmParameter := buildSsmParameterString(currentModel)
 	svc := ssm.New(req.Session)
+	jsonData, _ := json.Marshal(currentModel)
 	_, err = svc.PutParameter(&ssm.PutParameterInput{
 		Name:      &ssmParameter,
-		Value:     &id,
+		Value:     aws.String(string(jsonData)),
 		Overwrite: aws.Bool(false),
 		Tier:      aws.String("Standard"),
 		Type:      aws.String("String"),
@@ -77,7 +79,7 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 	// See if the SSM parameter exists to determine if the resource exists
 	ssmParameter := buildSsmParameterString(currentModel)
 	svc := ssm.New(req.Session)
-	_, err := svc.GetParameter(&ssm.GetParameterInput{
+	p, err := svc.GetParameter(&ssm.GetParameterInput{
 		Name: &ssmParameter,
 	})
 	if err != nil {
@@ -88,8 +90,14 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 		}, nil
 	}
 
-	// determine the offset
-	t, err := updateTimeWithOffset(currentModel)
+	err = json.Unmarshal([]byte(*p.Parameter.Value), currentModel)
+	if err != nil {
+		return handler.ProgressEvent{
+			OperationStatus:  handler.Failed,
+			HandlerErrorCode: cloudformation.HandlerErrorCodeInternalFailure,
+			Message:          "Error decoding SSM parameter value",
+		}, nil
+	}
 	if err != nil {
 		return handler.ProgressEvent{
 			OperationStatus:  handler.Failed,
@@ -99,9 +107,6 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 		}, nil
 	}
 
-	// convert a timestamp into the model so we have all the attributes
-	timeToModel(currentModel, t)
-
 	response := handler.ProgressEvent{
 		OperationStatus: handler.Success,
 		Message:         "Read complete",

resources/Time_Offset/test/integ.yml

@@ -1,7 +1,9 @@
 Resources:
-  Time:
-    Type: AwsCommunity::Time::Offset
-    Properties:
-      Time: "2023-03-31T18:51:56Z"
-      OffsetDays: 1
-
+    Time:
+        Type: AwsCommunity::Time::Offset
+        Properties:
+            Time: "2023-03-31T18:51:56Z"
+            OffsetDays: 1
+Outputs:
+    Time:
+        Value: !GetAtt Time.Utc

resources/Time_Static/cmd/resource/resource.go

@@ -1,6 +1,7 @@
 package resource
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
@@ -36,13 +37,15 @@ func Create(req handler.Request, _ *Model, currentModel *Model) (handler.Progres
 	// Save the unique identifier in SSM if it exists its a duplicate
 	ssmParameter := buildSsmParameterString(currentModel)
 	svc := ssm.New(req.Session)
+	jsonData, _ := json.Marshal(currentModel)
 	_, err := svc.PutParameter(&ssm.PutParameterInput{
 		Name:      &ssmParameter,
-		Value:     &id,
+		Value:     aws.String(string(jsonData)),
 		Overwrite: aws.Bool(false),
 		Tier:      aws.String("Standard"),
 		Type:      aws.String("String"),
 	})
+
 	if err != nil {
 		return handler.ProgressEvent{
 			OperationStatus:  handler.Failed,
@@ -66,9 +69,10 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 	// See if the SSM parameter exists to determine if the resource exists
 	ssmParameter := buildSsmParameterString(currentModel)
 	svc := ssm.New(req.Session)
-	_, err := svc.GetParameter(&ssm.GetParameterInput{
+	p, err := svc.GetParameter(&ssm.GetParameterInput{
 		Name: &ssmParameter,
 	})
+
 	if err != nil {
 		return handler.ProgressEvent{
 			OperationStatus:  handler.Failed,
@@ -78,7 +82,14 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 	}
 
 	// convert a timestamp into the model so we have all the attributes
-	timeToModel(currentModel)
+	err = json.Unmarshal([]byte(*p.Parameter.Value), currentModel)
+	if err != nil {
+		return handler.ProgressEvent{
+			OperationStatus:  handler.Failed,
+			HandlerErrorCode: cloudformation.HandlerErrorCodeInternalFailure,
+			Message:          "Error decoding SSM parameter value",
+		}, nil
+	}
 
 	response := handler.ProgressEvent{
 		OperationStatus: handler.Success,

resources/Time_Static/makebuild

@@ -4,4 +4,4 @@
 .PHONY: build
 build:
 	cfn generate
-	env GOOS=linux go build -ldflags="-s -w" -tags="$(TAGS)" -o bin/handler cmd/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags="$(TAGS)" -o bin/handler cmd/main.go

resources/Time_Static/resource-role-prod.yaml

@@ -26,7 +26,7 @@ Resources:
                 - "ssm:DeleteParameter"
                 - "ssm:GetParameter"
                 - "ssm:PutParameter"
-                Resource: !Sub "arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/CloudFormation/AwsCommunity/Time/Static/*"
+                Resource: "*"
 Outputs:
   ExecutionRoleArn:
     Value:

resources/Time_Static/resource-role.yaml

@@ -33,7 +33,7 @@ Resources:
                 - "ssm:DeleteParameter"
                 - "ssm:GetParameter"
                 - "ssm:PutParameter"
-                Resource: !Sub "arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/CloudFormation/AwsCommunity/Time/Static/*"
+                Resource: "*"
 Outputs:
   ExecutionRoleArn:
     Value:

resources/Time_Static/test/integ.yml

@@ -1,5 +1,8 @@
 Resources:
-  Time:
-    Type: AwsCommunity::Time::Static
-    Properties:
-      Time: "2023-03-31T18:51:56Z"
+    Time:
+        Type: AwsCommunity::Time::Static
+        Properties:
+            Time: "2023-03-31T18:51:56Z"
+Outputs:
+    Time:
+        Value: !GetAtt Time.Utc