Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions infra/bin/zar-fizzy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import 'source-map-support/register';

import { ZarApp } from '@zarpay/zar-cdk-lib';
import { FizzyStack } from '../lib/fizzy-stack.js';
import { environment, region } from '../lib/shared/global-variables.js';
import { FizzyStack } from '../lib/fizzy-stack';
import { environment, region } from '../lib/shared/global-variables';

const app = new ZarApp({
deployEnvironment: environment,
Expand Down
2 changes: 1 addition & 1 deletion infra/environments/config-loader.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as fs from 'fs';
import * as path from 'path';
import { environment } from '../lib/shared/global-variables.js';
import { environment } from '../lib/shared/global-variables';

function deepMerge(target: any, source: any): any {
if (typeof target !== 'object' || typeof source !== 'object') {
Expand Down
4 changes: 2 additions & 2 deletions infra/lib/constructs/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import * as logs from 'aws-cdk-lib/aws-logs';
import * as rds from 'aws-cdk-lib/aws-rds';
import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as secrets from 'aws-cdk-lib/aws-secretsmanager';
import { config } from '../../environments/config-loader.js';
import { environment, isProduction } from '../shared/global-variables.js';
import { config } from '../../environments/config-loader';
import { environment, isProduction } from '../shared/global-variables';

export interface DatabaseProps {
vpc: ec2.IVpc;
Expand Down
8 changes: 4 additions & 4 deletions infra/lib/constructs/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
import { Construct } from 'constructs';
import { EcrContainerImage, SharedAlbEcsFargateService } from '@zarpay/zar-cdk-lib';
import { config } from '../../environments/config-loader.js';
import { appName, environment, isProduction, smtp } from '../shared/global-variables.js';
import { Database } from './database.js';
import { Storage } from './storage.js';
import { config } from '../../environments/config-loader';
import { appName, environment, isProduction, smtp } from '../shared/global-variables';
import { Database } from './database';
import { Storage } from './storage';

interface ServiceProps {
vpc: ec2.IVpc;
Expand Down
2 changes: 1 addition & 1 deletion infra/lib/constructs/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Construct } from 'constructs';
import * as cdk from 'aws-cdk-lib';
import * as s3 from 'aws-cdk-lib/aws-s3';
import * as iam from 'aws-cdk-lib/aws-iam';
import { isProduction, region } from '../shared/global-variables.js';
import { isProduction, region } from '../shared/global-variables';

export class Storage extends Construct {
public readonly bucket: s3.Bucket;
Expand Down
8 changes: 4 additions & 4 deletions infra/lib/fizzy-stack.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as cdk from 'aws-cdk-lib/core';
import { awsOrganizationAccounts, EcrRepository, Platform } from '@zarpay/zar-cdk-lib';
import { Construct } from 'constructs';
import { Database } from './constructs/database.js';
import { Service } from './constructs/service.js';
import { Storage } from './constructs/storage.js';
import { isProduction, vpcName } from './shared/global-variables.js';
import { Database } from './constructs/database';
import { Service } from './constructs/service';
import { Storage } from './constructs/storage';
import { isProduction, vpcName } from './shared/global-variables';

export class FizzyStack extends cdk.Stack {
constructor(scope: Construct, id: string, props: cdk.StackProps) {
Expand Down
8 changes: 4 additions & 4 deletions infra/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"compilerOptions": {
"target": "ES2022",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"lib": ["es2022"],
"target": "ES2020",
"module": "commonjs",
"lib": ["es2020"],
"esModuleInterop": true,
"declaration": true,
"strict": true,
"noImplicitAny": true,
Expand Down