Replace Google Compute instance tests with stable GCS bucket resource

.github/workflows/stackql-assert-test.yml

@@ -33,11 +33,12 @@ jobs:
       uses: ./
       with:
         test_query: |
-            SELECT name
-            FROM google.compute.instances 
-            WHERE project = 'stackql-integration-tests' AND zone = 'australia-southeast1-a' and name = 'stackql-test-001';
+            SELECT name, location, locationType
+            FROM google.storage.buckets
+            WHERE project = 'stackql'
+            AND name = 'stackql-public-releases';
         expected_rows: 1
-      env: 
+      env:
         GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
 
     #
@@ -47,8 +48,8 @@ jobs:
       uses: ./
       with:
         test_query_file_path: './.github/workflows/workflow_scripts/google-example.iql'
-        expected_results_str: '[{"name":"stackql-test-001"}]'
-      env: 
+        expected_results_str: '[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]'
+      env:
         GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
 
     #
@@ -59,11 +60,9 @@ jobs:
       with:
         test_query_file_path: './.github/workflows/workflow_scripts/google-example-inline-jsonnet.iql'
         expected_results_file_path: './.github/workflows/workflow_scripts/google-example-inline-jsonnet-results.json'
-        vars: GOOGLE_PROJECT=${{ env.GOOGLE_PROJECT }},GOOGLE_ZONE=${{ env.GOOGLE_ZONE }}
-      env: 
+        vars: GOOGLE_PROJECT=stackql
+      env:
         GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-        GOOGLE_PROJECT: ${{ vars.GOOGLE_PROJECT }}
-        GOOGLE_ZONE: ${{ vars.GOOGLE_ZONE }}
 
     #
     # Example `test_query_file_path` with `expected_rows` supplying `vars` using `jsonnet` config provided using `data_file_path`

.github/workflows/workflow_scripts/google-example-inline-jsonnet-results.json

@@ -1 +1 @@
-[{"name":"stackql-test-001"}]
+[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]

.github/workflows/workflow_scripts/google-example-inline-jsonnet.iql

@@ -1,11 +1,10 @@
 <<<jsonnet
 local project = std.extVar("GOOGLE_PROJECT");
-local zone = std.extVar("GOOGLE_ZONE");
 {
    project: project,
-   zone: zone,
 }
 >>>
-SELECT name
-FROM google.compute.instances
-WHERE project = '{{ .project }}' and zone = '{{ .zone }}' and name = 'stackql-test-001';
+SELECT name, location, locationType
+FROM google.storage.buckets
+WHERE project = '{{ .project }}'
+AND name = 'stackql-public-releases';

.github/workflows/workflow_scripts/google-example.iql

@@ -1,3 +1,4 @@
-SELECT name
-FROM google.compute.instances 
-WHERE project = 'stackql-integration-tests' AND zone = 'australia-southeast1-a' AND name = 'stackql-test-001';
+SELECT name, location, locationType
+FROM google.storage.buckets
+WHERE project = 'stackql'
+AND name = 'stackql-public-releases';

lib/assert.js

@@ -20,6 +20,13 @@ const getExpectedResult = (expectedResultStr, expectedResultFilePath) => {
   return null;
 };
 
+const sortedStringify = (obj) => JSON.stringify(obj, Object.keys(obj).sort());
+
+const rowsMatch = (expected, actual) => {
+  if (expected.length !== actual.length) return false;
+  return expected.every((expectedRow, i) => sortedStringify(expectedRow) === sortedStringify(actual[i]));
+};
+
 const checkResult = (core, expected, actual, expectedRows) => {
   const actualLength = actual.length;
 
@@ -28,7 +35,7 @@ const checkResult = (core, expected, actual, expectedRows) => {
     return false;
   }
 
-  if (expected && JSON.stringify(expected) !== JSON.stringify(actual)) {
+  if (expected && !rowsMatch(expected, actual)) {
     core.error(`Expected results do not match actual results.\nExpected: ${JSON.stringify(expected)}\nActual: ${JSON.stringify(actual)}`);
     return false;
   }

lib/tests/assert.test.js

@@ -3,17 +3,17 @@ const {checkResult, parseResult, assertResult, getExpectedResult} = require('../
 describe('parseResult', ()=>{
 
     it('should parsedResult correctly', ()=>{
-        const resultString = `[{"name":"stackql-demo-001","status":"TERMINATED"}]`
-        const expected = [{"name":"stackql-demo-001","status":"TERMINATED"}]
+        const resultString = `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`
+        const expected = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
         const actual = parseResult(resultString);
         expect(actual).toEqual(expected);
     })
 })
 
 describe('getExpectedResult', ()=>{
     it('should return expectedResult when expectedResultStr is passed', ()=>{
-        const expectedResultStr = `[{"name":"stackql-demo-001","status":"TERMINATED"}]`
-        const expectedResult = [{"name":"stackql-demo-001","status":"TERMINATED"}]
+        const expectedResultStr = `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`
+        const expectedResult = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
 
         const actual = getExpectedResult(expectedResultStr, undefined);
 
@@ -22,7 +22,7 @@ describe('getExpectedResult', ()=>{
 
     it('should return expectedResult when expectedResultFilePath is passed', ()=>{
         const expectedResultFilePath = 'lib/tests/success-result.json'
-        const expectedResult = [{"name":"stackql-demo-001","status":"TERMINATED"}]
+        const expectedResult = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
 
         const actual = getExpectedResult(undefined, expectedResultFilePath);
 
@@ -42,7 +42,7 @@ describe('checkResult', () => {
         core.info.mockClear();
         core.error.mockClear();
         core.setFailed.mockClear();
-    });    
+    });
 
     it('should return false and log an error when the actual length does not match expected rows', () => {
         const expectedRows = "3";
@@ -89,8 +89,8 @@ describe('assertResult', ()=>{
     let coreObj;
 
     const ACTION_ENV = {
-        RESULT: `[{"name":"stackql-demo-001","status":"TERMINATED"}]`,
-        EXPECTED_RESULTS_STR: `[{"name":"stackql-demo-001","status":"TERMINATED"}]`,
+        RESULT: `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`,
+        EXPECTED_RESULTS_STR: `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`,
         EXPECTED_RESULTS_FILE_PATH: 'test.json',
         EXPECTED_ROWS: 1
     }
@@ -120,7 +120,7 @@ describe('assertResult', ()=>{
     });
 
     it('it should setFailed when actual result is not equal to expected result', () => {
-        process.env.RESULT= "[{\"name\":\"stackql-demo-001\",\"status\":\"RUNNING\"}]"
+        process.env.RESULT= "[{\"location\":\"EU\",\"locationType\":\"multi-region\",\"name\":\"stackql-public-releases\"}]"
 
         assertResult(coreObj)
 
@@ -185,6 +185,6 @@ describe('assertResult', ()=>{
         expect(coreObj.info).toHaveBeenCalledWith(expect.stringContaining('StackQL Assert Successful'))
     })
 
-    
+
 
 })

lib/tests/failed-result.json

@@ -1 +1 @@
-[{"name":"stackql-demo-001","status":"RUNNING"}]
+[{"location":"EU","locationType":"multi-region","name":"stackql-public-releases"}]

lib/tests/success-result.json

@@ -1 +1 @@
-[{"name":"stackql-demo-001","status":"TERMINATED"}]
+[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]