move cert files outside src

sundersc · May 1, 2024 · 7b9cdc3 · 7b9cdc3
1 parent ef46d0c
commit 7b9cdc3
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/packages/amplify-graphql-schema-generator/API.md b/packages/amplify-graphql-schema-generator/API.md
@@ -175,6 +175,12 @@ export const getParentNode: (ancestors: any[]) => ObjectTypeDefinitionNode | und
 // @public (undocumented)
 export const getRefersToDirective: (name: string) => DirectiveNode;
 
+// @public (undocumented)
+export const getSSLConfig: (host: string) => {
+ rejectUnauthorized: boolean;
+ ca?: string;
+};
+
 // @public (undocumented)
 export const graphqlSchemaFromSQLSchema: (sqlSchema: string, engineType: ImportedRDSType) => string;
 

diff --git a/...rator/src/certs/aws-rds-global-bundle.pem → ...generator/certs/aws-rds-global-bundle.pem b/...rator/src/certs/aws-rds-global-bundle.pem → ...generator/certs/aws-rds-global-bundle.pem
diff --git a/...ema-generator/src/certs/download-certs.sh → ...-schema-generator/certs/download-certs.sh b/...ema-generator/src/certs/download-certs.sh → ...-schema-generator/certs/download-certs.sh
diff --git a/packages/amplify-graphql-schema-generator/src/certs/index.ts b/packages/amplify-graphql-schema-generator/src/certs/index.ts
diff --git a/packages/amplify-graphql-schema-generator/src/datasource-adapter/mysql-datasource-adapter.ts b/packages/amplify-graphql-schema-generator/src/datasource-adapter/mysql-datasource-adapter.ts
@@ -1,10 +1,10 @@
 import { knex } from 'knex';
-import { invokeSchemaInspectorLambda } from '../utils/vpc-helper';
 import ora from 'ora';
+import { invokeSchemaInspectorLambda } from '../utils/vpc-helper';
 import { Field, Index } from '../schema-representation';
+import { getSSLConfig } from '../utils';
 import { DataSourceAdapter } from './datasource-adapter';
 import { MySQLStringDataSourceAdapter } from './mysql-string-datasource-adapter';
-import { getSSLConfig } from '../certs';
 
 const spinner = ora();
 export interface MySQLDataSourceConfig {

diff --git a/packages/amplify-graphql-schema-generator/src/datasource-adapter/pg-datasource-adapter.ts b/packages/amplify-graphql-schema-generator/src/datasource-adapter/pg-datasource-adapter.ts
@@ -1,10 +1,10 @@
 import { knex } from 'knex';
-import { invokeSchemaInspectorLambda } from '../utils/vpc-helper';
 import ora from 'ora';
+import { invokeSchemaInspectorLambda } from '../utils/vpc-helper';
 import { Field, Index } from '../schema-representation';
+import { getSSLConfig } from '../utils';
 import { DataSourceAdapter } from './datasource-adapter';
 import { PostgresStringDataSourceAdapter, expectedColumns } from './pg-string-datasource-adapter';
-import { getSSLConfig } from '../certs';
 
 const spinner = ora();
 

diff --git a/...raphql-schema-generator/src/certs/cert.ts → ...raphql-schema-generator/src/utils/cert.ts b/...raphql-schema-generator/src/certs/cert.ts → ...raphql-schema-generator/src/utils/cert.ts
@@ -23,6 +23,6 @@ const getRDSCertificate = (): string => {
  // The certificate is publicly available and downloaded from https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem
  // Proxies require
  const RDS_CERT_FILE_NAME = 'aws-rds-global-bundle.pem';
- const RDS_CERT_FILE_PATH = path.join(__dirname, RDS_CERT_FILE_NAME);
+ const RDS_CERT_FILE_PATH = path.join(__dirname, '..', '..', 'certs', RDS_CERT_FILE_NAME);
  return fs.readFileSync(RDS_CERT_FILE_PATH, 'utf-8');
 };
diff --git a/packages/amplify-graphql-schema-generator/src/utils/index.ts b/packages/amplify-graphql-schema-generator/src/utils/index.ts
@@ -1 +1,2 @@
 export * from './vpc-helper';
+export { getSSLConfig } from './cert';
diff --git a/...c-db-lambda/src/aws-rds-global-bundle.pem → ...c-db-lambda/lib/aws-rds-global-bundle.pem b/...c-db-lambda/src/aws-rds-global-bundle.pem → ...c-db-lambda/lib/aws-rds-global-bundle.pem
diff --git a/packages/amplify-graphql-schema-generator/vpc-db-lambda/src/connection.ts b/packages/amplify-graphql-schema-generator/vpc-db-lambda/src/connection.ts
@@ -1,4 +1,3 @@
-import * as path from 'path';
 import * as fs from 'fs';
 import knex, { Knex } from 'knex';
 
@@ -36,8 +35,7 @@ export const establishDBConnection = (config: any): any => {
 };
 
 const getRDSCertificate = (): string => {
- // This certificate file is copied from the parent folder `amplify-graphql-schema-generator/src/certs/aws-rds-global-bundle.pem`.
+ // This certificate file is copied from the parent folder `amplify-graphql-schema-generator/certs/aws-rds-global-bundle.pem`.
  const RDS_CERT_FILE_NAME = 'aws-rds-global-bundle.pem';
- const RDS_CERT_FILE_PATH = path.join(__dirname, RDS_CERT_FILE_NAME);
- return fs.readFileSync(RDS_CERT_FILE_PATH, 'utf-8');
+ return fs.readFileSync(RDS_CERT_FILE_NAME, 'utf-8');
 };