@openhi/constructs 0.0.22 → 0.0.24

package/lib/index.d.mts

@@ -371,7 +371,7 @@ interface RootGraphqlApiProps extends GraphqlApiProps {
 }
 declare class RootGraphqlApi extends GraphqlApi {
     /**
-     * Used when storing the GraphQl API ID in SSM.
+     * Used when storing the GraphQl API ID in SSM
      */
     static readonly SSM_PARAM_NAME = "ROOT_GRAPHQL_API";
     static fromConstruct(scope: Construct): IGraphqlApi;

package/lib/index.d.ts

@@ -451,7 +451,7 @@ interface RootGraphqlApiProps extends GraphqlApiProps {
 }
 declare class RootGraphqlApi extends GraphqlApi {
     /**
-     * Used when storing the GraphQl API ID in SSM.
+     * Used when storing the GraphQl API ID in SSM
      */
     static readonly SSM_PARAM_NAME = "ROOT_GRAPHQL_API";
     static fromConstruct(scope: Construct): IGraphqlApi;

package/lib/index.js

@@ -353,7 +353,7 @@ var OpenHiService = class extends import_aws_cdk_lib4.Stack {
     const appName = props.appName ?? ohEnv.ohStage.ohApp.appName ?? "openhi";
     const repoName = props.repoName ?? (0, import_utils.findGitRepoName)();
     const defaultReleaseBranch = props.defaultReleaseBranch ?? "main";
-    const branchName = props.branchName ?? (process.env.JEST_WORKER_ID ? "test-branch" : ohEnv.ohStage.stageType === import_config3.OPEN_HI_STAGE.DEV ? (0, import_utils.findGitBranch)() : defaultReleaseBranch);
+    const branchName = props.branchName ?? (process.env.JEST_WORKER_ID ? "test-branch" : process.env.GIT_BRANCH_NAME?.trim() || (ohEnv.ohStage.stageType === import_config3.OPEN_HI_STAGE.DEV ? (0, import_utils.findGitBranch)() : defaultReleaseBranch));
     const environmentHash = (0, import_utils.hashString)(
       [appName, ohEnv.deploymentTargetRole, account, region].join("-"),
       6
@@ -566,7 +566,7 @@ var _RootGraphqlApi = class _RootGraphqlApi extends import_aws_appsync.GraphqlAp
   }
 };
 /**
- * Used when storing the GraphQl API ID in SSM.
+ * Used when storing the GraphQl API ID in SSM
  */
 _RootGraphqlApi.SSM_PARAM_NAME = "ROOT_GRAPHQL_API";
 var RootGraphqlApi = _RootGraphqlApi;
@@ -668,18 +668,18 @@ var CognitoUserPoolKmsKey = class extends import_aws_kms.Key {
 CognitoUserPoolKmsKey.SSM_PARAM_NAME = "COGNITO_USER_POOL_KMS_KEY";
 
 // src/components/cognito/pre-token-generation-lambda.ts
-var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
+var import_node_fs = __toESM(require("fs"));
+var import_node_path = __toESM(require("path"));
 var import_aws_lambda = require("aws-cdk-lib/aws-lambda");
 var import_aws_lambda_nodejs = require("aws-cdk-lib/aws-lambda-nodejs");
 var import_constructs = require("constructs");
 var HANDLER_NAME = "pre-token-generation.handler.js";
 function resolveHandlerEntry(dirname) {
-  const sameDir = import_path.default.join(dirname, HANDLER_NAME);
-  if (import_fs.default.existsSync(sameDir)) {
+  const sameDir = import_node_path.default.join(dirname, HANDLER_NAME);
+  if (import_node_fs.default.existsSync(sameDir)) {
     return sameDir;
   }
-  const fromLib = import_path.default.join(dirname, "..", "..", "..", "lib", HANDLER_NAME);
+  const fromLib = import_node_path.default.join(dirname, "..", "..", "..", "lib", HANDLER_NAME);
   return fromLib;
 }
 var PreTokenGenerationLambda = class extends import_constructs.Construct {
@@ -1161,15 +1161,25 @@ _OpenHiDataService.SERVICE_TYPE = "data";
 var OpenHiDataService = _OpenHiDataService;
 
 // src/data/lambda/rest-api-lambda.ts
-var import_path2 = __toESM(require("path"));
+var import_node_fs2 = __toESM(require("fs"));
+var import_node_path2 = __toESM(require("path"));
 var import_aws_lambda2 = require("aws-cdk-lib/aws-lambda");
 var import_aws_lambda_nodejs2 = require("aws-cdk-lib/aws-lambda-nodejs");
 var import_constructs3 = require("constructs");
+var HANDLER_NAME2 = "rest-api-lambda.handler.js";
+function resolveHandlerEntry2(dirname) {
+  const sameDir = import_node_path2.default.join(dirname, HANDLER_NAME2);
+  if (import_node_fs2.default.existsSync(sameDir)) {
+    return sameDir;
+  }
+  const fromLib = import_node_path2.default.join(dirname, "..", "..", "..", "lib", HANDLER_NAME2);
+  return fromLib;
+}
 var RestApiLambda = class extends import_constructs3.Construct {
   constructor(scope, props) {
     super(scope, "rest-api-lambda");
     this.lambda = new import_aws_lambda_nodejs2.NodejsFunction(this, "handler", {
-      entry: import_path2.default.join(__dirname, "rest-api-lambda.handler.js"),
+      entry: resolveHandlerEntry2(__dirname),
       runtime: import_aws_lambda2.Runtime.NODEJS_LATEST,
       memorySize: 1024,
       environment: {