chore: fix merge conflict

jonife · Mar 15, 2024 · b16799a · b16799a
2 parents dcc1e75 + f2ad980
commit b16799a
Show file tree

Hide file tree

Showing 25 changed files with 531 additions and 191 deletions.
diff --git a/....js.snapshot/cluster-kerberos.assets.json → ....js.snapshot/cluster-data-api.assets.json b/....js.snapshot/cluster-kerberos.assets.json → ....js.snapshot/cluster-data-api.assets.json
diff --git a/...s.snapshot/cluster-kerberos.template.json → ...s.snapshot/cluster-data-api.template.json b/...s.snapshot/cluster-kerberos.template.json → ...s.snapshot/cluster-data-api.template.json
@@ -10,7 +10,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC"
+      "Value": "cluster-data-api/VPC"
      }
     ]
    }
@@ -39,7 +39,7 @@
      },
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet1"
+      "Value": "cluster-data-api/VPC/PublicSubnet1"
      }
     ],
     "VpcId": {
@@ -53,7 +53,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet1"
+      "Value": "cluster-data-api/VPC/PublicSubnet1"
      }
     ],
     "VpcId": {
@@ -94,7 +94,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet1"
+      "Value": "cluster-data-api/VPC/PublicSubnet1"
      }
     ]
    }
@@ -114,7 +114,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet1"
+      "Value": "cluster-data-api/VPC/PublicSubnet1"
      }
     ]
    },
@@ -147,7 +147,7 @@
      },
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet2"
+      "Value": "cluster-data-api/VPC/PublicSubnet2"
      }
     ],
     "VpcId": {
@@ -161,7 +161,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet2"
+      "Value": "cluster-data-api/VPC/PublicSubnet2"
      }
     ],
     "VpcId": {
@@ -202,7 +202,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet2"
+      "Value": "cluster-data-api/VPC/PublicSubnet2"
      }
     ]
    }
@@ -222,7 +222,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PublicSubnet2"
+      "Value": "cluster-data-api/VPC/PublicSubnet2"
      }
     ]
    },
@@ -255,7 +255,7 @@
      },
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PrivateSubnet1"
+      "Value": "cluster-data-api/VPC/PrivateSubnet1"
      }
     ],
     "VpcId": {
@@ -269,7 +269,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PrivateSubnet1"
+      "Value": "cluster-data-api/VPC/PrivateSubnet1"
      }
     ],
     "VpcId": {
@@ -324,7 +324,7 @@
      },
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PrivateSubnet2"
+      "Value": "cluster-data-api/VPC/PrivateSubnet2"
      }
     ],
     "VpcId": {
@@ -338,7 +338,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC/PrivateSubnet2"
+      "Value": "cluster-data-api/VPC/PrivateSubnet2"
      }
     ],
     "VpcId": {
@@ -375,7 +375,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "cluster-kerberos/VPC"
+      "Value": "cluster-data-api/VPC"
      }
     ]
    }
@@ -543,6 +543,16 @@
    "Properties": {
     "PolicyDocument": {
      "Statement": [
+      {
+       "Action": [
+        "secretsmanager:DescribeSecret",
+        "secretsmanager:GetSecretValue"
+       ],
+       "Effect": "Allow",
+       "Resource": {
+        "Ref": "DatabaseSecretAttachmentE5D1B020"
+       }
+      },
       {
        "Action": [
         "rds-data:BatchExecuteStatement",
@@ -575,16 +585,6 @@
          ]
         ]
        }
-      },
-      {
-       "Action": [
-        "secretsmanager:DescribeSecret",
-        "secretsmanager:GetSecretValue"
-       ],
-       "Effect": "Allow",
-       "Resource": {
-        "Ref": "DatabaseSecretAttachmentE5D1B020"
-       }
       }
      ],
      "Version": "2012-10-17"

diff --git a/...k-testing/framework-integ/test/aws-rds/test/integ.cluster-data-api.js.snapshot/integ.json b/...k-testing/framework-integ/test/aws-rds/test/integ.cluster-data-api.js.snapshot/integ.json