Merge pull request #206 from stackql/dev

updated `awscc` provider
stackql · Mar 7, 2024 · 87a4813 · 87a4813
2 parents d752a06 + 0b312bc
commit 87a4813
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 96 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
       REG_DENO_DEPLOY_API_PROD: stackql-registry
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         name: "[SETUP] checkout repo"
         with:
           fetch-depth: 0
@@ -67,7 +67,7 @@ jobs:
 
       - name: '[PACKAGE] set up golang'
         if: env.NUM_PROVIDERS > 0
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5.0.0
         with:
           go-version: ^1.19
           check-latest: true
@@ -124,7 +124,6 @@ jobs:
           while IFS= read -r provider
           do
             echo "testing ${provider}..."
-            tree $providersdir
             sh test-provider.sh $provider false $providersdir
           done < ../providers.txt
 

diff --git a/providers/src/awscc/v00.00.00000/provider.yaml b/providers/src/awscc/v00.00.00000/provider.yaml
@@ -1870,4 +1870,3 @@ config:
     type: aws_signing_v4
     credentialsenvvar: AWS_SECRET_ACCESS_KEY
     keyIDenvvar: AWS_ACCESS_KEY_ID
-
diff --git a/providers/src/awscc/v00.00.00000/services/.gitignore b/providers/src/awscc/v00.00.00000/services/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/providers/src/awscc/v00.00.00000/services/neptune.yaml b/providers/src/awscc/v00.00.00000/services/neptune.yaml
@@ -285,15 +285,15 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.DBClusterIdentifier') as d_bcluster_identifier
+              JSON_EXTRACT(Properties, '$.DBClusterIdentifier') as dbcluster_identifier
               FROM awscc.cloud_control.resources WHERE data__TypeName = 'AWS::Neptune::DBCluster'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'DBClusterIdentifier') as d_bcluster_identifier
+                json_extract_path_text(Properties, 'DBClusterIdentifier') as dbcluster_identifier
                 FROM awscc.cloud_control.resources WHERE data__TypeName = 'AWS::Neptune::DBCluster'
                 AND region = 'us-east-1'
     db_cluster:
@@ -317,11 +317,11 @@ components:
               JSON_EXTRACT(Properties, '$.AvailabilityZones') as availability_zones,
               JSON_EXTRACT(Properties, '$.BackupRetentionPeriod') as backup_retention_period,
               JSON_EXTRACT(Properties, '$.CopyTagsToSnapshot') as copy_tags_to_snapshot,
-              JSON_EXTRACT(Properties, '$.DBClusterIdentifier') as d_bcluster_identifier,
-              JSON_EXTRACT(Properties, '$.DBClusterParameterGroupName') as d_bcluster_parameter_group_name,
-              JSON_EXTRACT(Properties, '$.DBInstanceParameterGroupName') as d_binstance_parameter_group_name,
-              JSON_EXTRACT(Properties, '$.DBPort') as d_bport,
-              JSON_EXTRACT(Properties, '$.DBSubnetGroupName') as d_bsubnet_group_name,
+              JSON_EXTRACT(Properties, '$.DBClusterIdentifier') as dbcluster_identifier,
+              JSON_EXTRACT(Properties, '$.DBClusterParameterGroupName') as dbcluster_parameter_group_name,
+              JSON_EXTRACT(Properties, '$.DBInstanceParameterGroupName') as dbinstance_parameter_group_name,
+              JSON_EXTRACT(Properties, '$.DBPort') as dbport,
+              JSON_EXTRACT(Properties, '$.DBSubnetGroupName') as dbsubnet_group_name,
               JSON_EXTRACT(Properties, '$.DeletionProtection') as deletion_protection,
               JSON_EXTRACT(Properties, '$.EnableCloudwatchLogsExports') as enable_cloudwatch_logs_exports,
               JSON_EXTRACT(Properties, '$.EngineVersion') as engine_version,
@@ -354,11 +354,11 @@ components:
                 json_extract_path_text(Properties, 'AvailabilityZones') as availability_zones,
                 json_extract_path_text(Properties, 'BackupRetentionPeriod') as backup_retention_period,
                 json_extract_path_text(Properties, 'CopyTagsToSnapshot') as copy_tags_to_snapshot,
-                json_extract_path_text(Properties, 'DBClusterIdentifier') as d_bcluster_identifier,
-                json_extract_path_text(Properties, 'DBClusterParameterGroupName') as d_bcluster_parameter_group_name,
-                json_extract_path_text(Properties, 'DBInstanceParameterGroupName') as d_binstance_parameter_group_name,
-                json_extract_path_text(Properties, 'DBPort') as d_bport,
-                json_extract_path_text(Properties, 'DBSubnetGroupName') as d_bsubnet_group_name,
+                json_extract_path_text(Properties, 'DBClusterIdentifier') as dbcluster_identifier,
+                json_extract_path_text(Properties, 'DBClusterParameterGroupName') as dbcluster_parameter_group_name,
+                json_extract_path_text(Properties, 'DBInstanceParameterGroupName') as dbinstance_parameter_group_name,
+                json_extract_path_text(Properties, 'DBPort') as dbport,
+                json_extract_path_text(Properties, 'DBSubnetGroupName') as dbsubnet_group_name,
                 json_extract_path_text(Properties, 'DeletionProtection') as deletion_protection,
                 json_extract_path_text(Properties, 'EnableCloudwatchLogsExports') as enable_cloudwatch_logs_exports,
                 json_extract_path_text(Properties, 'EngineVersion') as engine_version,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1870,4 +1870,3 @@ config:
		type: aws_signing_v4
		credentialsenvvar: AWS_SECRET_ACCESS_KEY
		keyIDenvvar: AWS_ACCESS_KEY_ID