fix: raw file content (#1035)

* fix: raw file content * chore: self mutation Signed-off-by: github-actions <[email protected]> --------- Signed-off-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]>
dbsystel · Jun 4, 2024 · ae1735b · ae1735b
1 parent 1afcd09
commit ae1735b
Show file tree

Hide file tree

Showing 15 changed files with 3,066 additions and 2,815 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projenrc.js b/.projenrc.js
@@ -2,7 +2,7 @@ const { awscdk } = require('projen');
 const project = new awscdk.AwsCdkConstructLibrary({
   author: 'Markus Siebert',
   authorAddress: '[email protected]',
-  cdkVersion: '2.1.0',
+  cdkVersion: '2.144.0',
   stability: 'stable',
   homepage: 'https://constructs.dev/packages/cdk-sops-secrets',
   description:

diff --git a/API.md b/API.md
diff --git a/lambda/main.go b/lambda/main.go
@@ -76,9 +76,8 @@ func decryptSopsFileContent(content []byte, format string) (data []byte, err err
 func (a AWS) updateSecret(sopsHash string, secretArn string, secretContent []byte) (data *secretsmanager.PutSecretValueOutput, err error) {
 	secretContentString := string(secretContent)
 	input := &secretsmanager.PutSecretValueInput{
-		SecretId:     &secretArn,
-		SecretString: &secretContentString,
-
+		SecretId:           &secretArn,
+		SecretString:       &secretContentString,
 		ClientRequestToken: &sopsHash,
 	}
 	secretResp, secretErr := a.secretsmanager.PutSecretValue(input)
@@ -156,7 +155,6 @@ func (a AWS) syncSopsToSecretsmanager(ctx context.Context, event cfn.Event) (phy
 		if err != nil {
 			return tempArn, nil, err
 		}
-		//log.Println(string(decryptedContent))
 		var decryptedInterface interface{}
 		switch resourceProperties.Format {
 		case "json":
@@ -197,6 +195,7 @@ func (a AWS) syncSopsToSecretsmanager(ctx context.Context, event cfn.Event) (phy
 			{
 				resourceProperties.Flatten = "false"
 				resourceProperties.StringifyValues = "false"
+				resourceProperties.ConvertToJSON = "false"
 			}
 		default:
 			return "", nil, errors.New(fmt.Sprintf("Format %s not supported", resourceProperties.Format))
@@ -254,7 +253,6 @@ func (a AWS) syncSopsToSecretsmanager(ctx context.Context, event cfn.Event) (phy
 				return tempArn, nil, err
 			}
 		}
-
 		// Write the secret
 		updateSecretResp, err := a.updateSecret(sopsHash, resourceProperties.SecretARN, decryptedContent)
 		if err != nil {

diff --git a/package.json b/package.json
diff --git a/test/secret-asset.integ.snapshot/SecretIntegrationAsset.assets.json b/test/secret-asset.integ.snapshot/SecretIntegrationAsset.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "15.0.0",
+  "version": "36.0.0",
   "files": {
-    "5d28ae171b06a74255e5da3e3fad8477ed5dffc98b55e885ba99f56afe95cd58": {
+    "ba702541966a10511eb4b7534ec99ec011e3eb46bf38fe5a5d95c03b97bcde67": {
       "source": {
-        "path": "asset.5d28ae171b06a74255e5da3e3fad8477ed5dffc98b55e885ba99f56afe95cd58.zip",
+        "path": "asset.ba702541966a10511eb4b7534ec99ec011e3eb46bf38fe5a5d95c03b97bcde67.zip",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "5d28ae171b06a74255e5da3e3fad8477ed5dffc98b55e885ba99f56afe95cd58.zip",
+          "objectKey": "ba702541966a10511eb4b7534ec99ec011e3eb46bf38fe5a5d95c03b97bcde67.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
@@ -79,15 +79,15 @@
         }
       }
     },
-    "3df20cebd8befd8c2eee521149078eeef238b022cabf42327fc78fa91a5e1539": {
+    "6877367a0b0bf6c211df7db09e390a34f27dde480c9c7591a54f097775ed6c47": {
       "source": {
         "path": "SecretIntegrationAsset.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "3df20cebd8befd8c2eee521149078eeef238b022cabf42327fc78fa91a5e1539.json",
+          "objectKey": "6877367a0b0bf6c211df7db09e390a34f27dde480c9c7591a54f097775ed6c47.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }