File tree Expand file tree Collapse file tree 4 files changed +36
-3
lines changed Expand file tree Collapse file tree 4 files changed +36
-3
lines changed Original file line number Diff line number Diff line change @@ -161,6 +161,8 @@ jobs:
161
161
POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB
162
162
POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME
163
163
POSTGRES_CAS_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_PASS
164
+ POSTGRES_CUSTOMER_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
165
+ POSTGRES_CUSTOMER_CAS_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CUSTOMER_CAS_PASS
164
166
SQLSERVER_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_CONNECTION_NAME
165
167
SQLSERVER_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_USER
166
168
SQLSERVER_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_PASS
@@ -188,6 +190,8 @@ jobs:
188
190
POSTGRES_DB : " ${{ steps.secrets.outputs.POSTGRES_DB }}"
189
191
POSTGRES_CAS_CONNECTION_NAME : " ${{ steps.secrets.outputs.POSTGRES_CAS_CONNECTION_NAME }}"
190
192
POSTGRES_CAS_PASS : " ${{ steps.secrets.outputs.POSTGRES_CAS_PASS }}"
193
+ POSTGRES_CUSTOMER_CAS_CONNECTION_NAME : " ${{ steps.secrets.outputs.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME }}"
194
+ POSTGRES_CUSTOMER_CAS_PASS : " ${{ steps.secrets.outputs.POSTGRES_CUSTOMER_CAS_PASS }}"
191
195
SQLSERVER_CONNECTION_NAME : " ${{ steps.secrets.outputs.SQLSERVER_CONNECTION_NAME }}"
192
196
SQLSERVER_USER : " ${{ steps.secrets.outputs.SQLSERVER_USER }}"
193
197
SQLSERVER_PASS : " ${{ steps.secrets.outputs.SQLSERVER_PASS }}"
Original file line number Diff line number Diff line change @@ -36,7 +36,10 @@ export function validateCertificate(
36
36
dnsName : string
37
37
) {
38
38
return ( hostname : string , cert : tls . PeerCertificate ) : Error | undefined => {
39
- if ( serverCaMode === 'GOOGLE_MANAGED_CAS_CA' ) {
39
+ if (
40
+ serverCaMode === 'GOOGLE_MANAGED_CAS_CA' ||
41
+ serverCaMode === 'CUSTOMER_MANAGED_CAS_CA'
42
+ ) {
40
43
return tls . checkServerIdentity ( dnsName , cert ) ;
41
44
}
42
45
if ( ! cert || ! cert . subject ) {
Original file line number Diff line number Diff line change @@ -93,3 +93,31 @@ t.test(
93
93
connector . close ( ) ;
94
94
}
95
95
) ;
96
+
97
+ t . test (
98
+ 'open connection to Customer Private CAS-based CA instance and retrieves standard pg tables' ,
99
+ async t => {
100
+ const connector = new Connector ( ) ;
101
+ const clientOpts = await connector . getOptions ( {
102
+ instanceConnectionName : String (
103
+ process . env . POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
104
+ ) ,
105
+ } ) ;
106
+ const client = new Client ( {
107
+ ...clientOpts ,
108
+ user : String ( process . env . POSTGRES_USER ) ,
109
+ password : String ( process . env . POSTGRES_CUSTOMER_CAS_PASS ) ,
110
+ database : String ( process . env . POSTGRES_DB ) ,
111
+ } ) ;
112
+ client . connect ( ) ;
113
+
114
+ const {
115
+ rows : [ result ] ,
116
+ } = await client . query ( 'SELECT NOW();' ) ;
117
+ const returnedDate = result [ 'now' ] ;
118
+ t . ok ( returnedDate . getTime ( ) , 'should have valid returned date object' ) ;
119
+
120
+ await client . end ( ) ;
121
+ connector . close ( ) ;
122
+ }
123
+ ) ;
You can’t perform that action at this time.
0 commit comments