add postgres unit test

packages/amplify-graphql-schema-generator/src/__tests__/__snapshots__/generate-ts-data-schema.test.ts.snap

@@ -75,6 +75,40 @@ export const schema = a.schema({
 "
 `;
 
+exports[`Type name conversions postgres schema with database config secret and vpc should generate typescript data schema with configure 1`] = `
+"/* eslint-disable */
+import { a } from \\"@aws-amplify/data-schema\\";
+import { configure } from \\"@aws-amplify/data-schema/internals\\";
+import { secret } from \\"@aws-amplify/backend\\";
+
+export const schema = configure({
+ database: {
+ engine: \\"postgresql\\",
+ connectionUri: secret(\\"CONN_STR\\"),
+ vpc: {
+ vpcId: \\"123\\",
+ securityGroupIds: [
+ \\"sb1\\"
+ ],
+ subnetAvailabilityZoneConfig: [
+ {
+ subnetId: \\"sb1\\",
+ availabilityZone: \\"az1\\"
+ }
+ ]
+ }
+ }
+}).schema({
+ \\"User\\": a.model({
+ id: a.string().required(),
+ name: a.string()
+ }).identifier([
+ \\"id\\"
+ ])
+});
+"
+`;
+
 exports[`Type name conversions schema with database config secret and vpc should generate typescript data schema with configure 1`] = `
 "/* eslint-disable */
 import { a } from \\"@aws-amplify/data-schema\\";

packages/amplify-graphql-schema-generator/src/__tests__/generate-ts-data-schema.test.ts

@@ -100,6 +100,32 @@ describe('Type name conversions', () => {
  expect(graphqlSchema).toMatchSnapshot();
  });
 
+ it('postgres schema with database config secret and vpc should generate typescript data schema with configure', () => {
+ const dbschema = new Schema(new Engine('Postgres'));
+ const model = new Model('User');
+ model.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+ model.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+ model.setPrimaryKey(['id']);
+ dbschema.addModel(model);
+
+ const config: DatasourceConfig = {
+ secretName: 'CONN_STR',
+ vpcConfig: {
+ vpcId: '123',
+ securityGroupIds: ['sb1'],
+ subnetAvailabilityZoneConfig: [
+ {
+ subnetId: 'sb1',
+ availabilityZone: 'az1'
+ },
+ ],
+ },
+ };
+
+ const graphqlSchema = generateTypescriptDataSchema(dbschema, config);
+ expect(graphqlSchema).toMatchSnapshot();
+ });
+
  it('schema with database config without vpc should generate typescript data schema with configure', () => {
  const dbschema = new Schema(new Engine('MySQL'));
  let model = new Model('User');

packages/amplify-graphql-schema-generator/src/ts-schema-generator/ts-schema-generator.ts

@@ -12,7 +12,6 @@ export type TypescriptDataSchemaGeneratorConfig = {
  username: string;
  password: string;
  connectionUriSecretName: string;
- region?: string;
  outputFile?: string;
 };
 
@@ -22,7 +21,7 @@ export class TypescriptDataSchemaGenerator {
  const schema = await TypescriptDataSchemaGenerator.buildSchema(config);
  return generateTypescriptDataSchema(schema, {
  secretName: config.connectionUriSecretName,
- vpcConfig: config.region ? await getHostVpc(config.host, config.region) : undefined,
+ vpcConfig: await getHostVpc(config.host),
  });
  };
 

packages/amplify-graphql-schema-generator/src/utils/vpc-helper-cluster.ts

@@ -9,7 +9,8 @@ import { VpcConfig, SubnetAvailabilityZone } from '@aws-amplify/graphql-transfor
 import { DB_ENGINES } from './supported-db-engines';
 import { filterSubnetAvailabilityZones } from './filter-subnet-availability-zones';
 
-export const checkHostInDBClusters = async (hostname: string, region: string): Promise<VpcConfig | undefined> => {
+// When region is not provided, it will use the region configured in the AWS profile.
+export const checkHostInDBClusters = async (hostname: string, region?: string): Promise<VpcConfig | undefined> => {
  const client = new RDSClient({ region });
  const params: DescribeDBClustersCommandInput = {
  Filters: [

packages/amplify-graphql-schema-generator/src/utils/vpc-helper-instance.ts

@@ -8,7 +8,8 @@ import { SubnetAvailabilityZone, VpcConfig } from '@aws-amplify/graphql-transfor
 import { DB_ENGINES } from './supported-db-engines';
 import { filterSubnetAvailabilityZones } from './filter-subnet-availability-zones';
 
-export const checkHostInDBInstances = async (hostname: string, region: string): Promise<VpcConfig | undefined> => {
+// When region is not provided, it will use the region configured in the AWS profile.
+export const checkHostInDBInstances = async (hostname: string, region?: string): Promise<VpcConfig | undefined> => {
  const client = new RDSClient({ region });
  const params: DescribeDBInstancesCommandInput = {
  Filters: [

packages/amplify-graphql-schema-generator/src/utils/vpc-helper-proxy.ts

@@ -4,7 +4,8 @@ import { VpcConfig, SubnetAvailabilityZone } from '@aws-amplify/graphql-transfor
 import { DB_ENGINES } from './supported-db-engines';
 import { filterSubnetAvailabilityZones } from './filter-subnet-availability-zones';
 
-export const checkHostInDBProxies = async (hostname: string, region: string): Promise<VpcConfig | undefined> => {
+// When region is not provided, it will use the region configured in the AWS profile.
+export const checkHostInDBProxies = async (hostname: string, region?: string): Promise<VpcConfig | undefined> => {
  const client = new RDSClient({ region });
  const params: DescribeDBProxiesCommandInput = {
  Filters: [

packages/amplify-graphql-schema-generator/src/utils/vpc-helper.ts

@@ -39,12 +39,12 @@ const spinner = ora('');
 /**
  * Searches for the host in DB Proxies, then DB Clusters, and finally DB Instances. Returns the VPC configuration if found. Note that some
  * inspections may require additional API calls to derive subnet and availability zone configurations.
- *
+ * When region is not provided, we will use the region configured in the AWS profile.
  * @param hostname Hostname of the database.
  * @param region AWS region.
  * @returns the VpcConfig for the database or undefined if not found.
  */
-export const getHostVpc = async (hostname: string, region: string): Promise<VpcConfig | undefined> => {
+export const getHostVpc = async (hostname: string, region?: string): Promise<VpcConfig | undefined> => {
  const proxyResult = await checkHostInDBProxies(hostname, region);
  if (proxyResult) {
  return proxyResult;