Merge pull request #617 from JupiterOne/INT-8173/expose-cloud-logging

INT-8173: change cloud logging status type
JupiterOne-Archives · Jul 13, 2023 · 5d56d6c · 5d56d6c
2 parents c903d79 + 12d60ea
commit 5d56d6c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/src/steps/dns/__snapshots__/converters.test.ts.snap b/src/steps/dns/__snapshots__/converters.test.ts.snap
@@ -27,7 +27,7 @@ Object {
     },
   ],
   "_type": "google_dns_managed_zone",
-  "cloudLoggingStatus": false,
+  "cloudLoggingStatus": "disabled",
   "createdOn": 1611334107272,
   "description": "",
   "displayName": "example-zone",
@@ -77,7 +77,7 @@ Object {
     },
   ],
   "_type": "google_dns_managed_zone",
-  "cloudLoggingStatus": true,
+  "cloudLoggingStatus": "enabled",
   "createdOn": 1611334107272,
   "description": "",
   "displayName": "example-zone",
@@ -135,7 +135,7 @@ Object {
     },
   ],
   "_type": "google_dns_managed_zone",
-  "cloudLoggingStatus": false,
+  "cloudLoggingStatus": "disabled",
   "createdOn": 1611334107272,
   "description": "",
   "displayName": "example-zone",
@@ -193,7 +193,7 @@ Object {
     },
   ],
   "_type": "google_dns_managed_zone",
-  "cloudLoggingStatus": false,
+  "cloudLoggingStatus": "disabled",
   "createdOn": 1611334107272,
   "description": "",
   "displayName": "example-zone",

diff --git a/src/steps/dns/__snapshots__/index.test.ts.snap b/src/steps/dns/__snapshots__/index.test.ts.snap
@@ -29,7 +29,7 @@ Object {
         },
       ],
       "_type": "google_dns_managed_zone",
-      "cloudLoggingStatus": false,
+      "cloudLoggingStatus": "disabled",
       "createdOn": 1613606661953,
       "description": "Example DNS zone",
       "displayName": "example-public-zone",

diff --git a/src/steps/dns/cloudLoggingConfigParser.test.ts b/src/steps/dns/cloudLoggingConfigParser.test.ts
@@ -3,41 +3,41 @@ import { cloudLoggingConfigParser } from './cloudLoggingConfigParser';
 describe('CloudLoggingConfigParser', () => {
   describe('parseEnableLoggingStatus()', () => {
     describe('given undefined as argument', () => {
-      it('should return false', () => {
+      it('should return "disabled"', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus();
-        expect(result).toEqual(false);
+        expect(result).toEqual('disabled');
       });
     });
 
     describe('given null as argument', () => {
-      it('should return false', () => {
+      it('should return "disabled"', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus();
-        expect(result).toEqual(false);
+        expect(result).toEqual('disabled');
       });
     });
 
     describe('given enableLogging equal to undefined', () => {
-      it('should return false', () => {
+      it('should return "disabled"', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus({});
-        expect(result).toEqual(false);
+        expect(result).toEqual('disabled');
       });
     });
 
     describe('given enableLogging equal to null', () => {
-      it('should return false', () => {
+      it('should return "disabled"', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus({
           enableLogging: null,
         });
-        expect(result).toEqual(false);
+        expect(result).toEqual('disabled');
       });
     });
 
     describe('given enableLogging equal to false', () => {
-      it('should return false', () => {
+      it('should return "disabled"', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus({
           enableLogging: false,
         });
-        expect(result).toEqual(false);
+        expect(result).toEqual('disabled');
       });
     });
 
@@ -46,7 +46,7 @@ describe('CloudLoggingConfigParser', () => {
         const result = cloudLoggingConfigParser.parseEnableLoggingStatus({
           enableLogging: true,
         });
-        expect(result).toEqual(true);
+        expect(result).toEqual('enabled');
       });
     });
   });

diff --git a/src/steps/dns/cloudLoggingConfigParser.ts b/src/steps/dns/cloudLoggingConfigParser.ts
@@ -1,20 +1,22 @@
 import { dns_v1 } from 'googleapis';
 
+type ManagedZoneCloudLoggingConfigStatus = 'disabled' | 'enabled';
+
 const parseEnableLoggingStatus = (
   cloudLoggingConfig?: dns_v1.Schema$ManagedZoneCloudLoggingConfig,
-): boolean => {
+): ManagedZoneCloudLoggingConfigStatus => {
   if (cloudLoggingConfig === undefined || cloudLoggingConfig === null) {
-    return false;
+    return 'disabled';
   }
 
   if (
     cloudLoggingConfig.enableLogging === undefined ||
     cloudLoggingConfig.enableLogging === null
   ) {
-    return false;
+    return 'disabled';
   }
 
-  return cloudLoggingConfig.enableLogging;
+  return cloudLoggingConfig.enableLogging ? 'enabled' : 'disabled';
 };
 
 export const cloudLoggingConfigParser = {

diff --git a/src/steps/dns/index.test.ts b/src/steps/dns/index.test.ts
@@ -74,7 +74,7 @@ describe('#fetchDNSManagedZones', () => {
           keySigningAlgorithm: { type: 'string' },
           zoneSigningAlgorithm: { type: 'string' },
           createdOn: { type: 'number' },
-          cloudLoggingStatus: { type: 'boolean' },
+          cloudLoggingStatus: { type: 'string' },
         },
       },
     });