chore: default dnsName and serverCaMode

GoogleCloudPlatform · Sep 27, 2024 · a536813 · a536813
1 parent faedae5
commit a536813
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/cloud-sql-instance.ts b/src/cloud-sql-instance.ts
@@ -75,8 +75,8 @@ export class CloudSQLInstance {
   public port = 3307;
   public privateKey?: string;
   public serverCaCert?: SslCert;
-  public serverCaMode?: string | null | undefined;
-  public dnsName?: string | null | undefined;
+  public serverCaMode = '';
+  public dnsName = '';
 
   constructor({
     ipType,

diff --git a/src/socket.ts b/src/socket.ts
@@ -26,14 +26,14 @@ interface SocketOptions {
   instanceInfo: InstanceConnectionInfo;
   privateKey: string;
   serverCaCert: SslCert;
-  serverCaMode?: string | null | undefined;
-  dnsName?: string | null | undefined;
+  serverCaMode: string;
+  dnsName: string;
 }
 
 export function validateCertificate(
   instanceInfo: InstanceConnectionInfo,
-  serverCaMode?: string | null | undefined,
-  dnsName?: string | null | undefined
+  serverCaMode: string,
+  dnsName: string
 ) {
   return (hostname: string, cert: tls.PeerCertificate): Error | undefined => {
     if (serverCaMode == 'GOOGLE_MANAGED_CAS_CA') {

diff --git a/src/sqladmin-fetcher.ts b/src/sqladmin-fetcher.ts
@@ -27,8 +27,8 @@ import {AuthTypes} from './auth-types';
 export interface InstanceMetadata {
   ipAddresses: IpAddresses;
   serverCaCert: SslCert;
-  serverCaMode?: string | null | undefined;
-  dnsName?: string | null | undefined;
+  serverCaMode: string;
+  dnsName: string;
 }
 
 interface RequestBody {
@@ -218,8 +218,8 @@ export class SQLAdminFetcher {
         cert: serverCaCert.cert,
         expirationTime: serverCaCert.expirationTime,
       },
-      serverCaMode: res.data.serverCaMode,
-      dnsName: res.data.dnsName,
+      serverCaMode: res.data.serverCaMode || '',
+      dnsName: res.data.dnsName || '',
     };
   }