Skip to content

Commit d475662

Browse files
Merge branch 'main' into CCP-4138-empty-json-download
2 parents fc29d05 + b091b37 commit d475662

157 files changed

Lines changed: 12617 additions & 500 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/chefs_local/local.sample.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
"frontend": {
3535
"apiPath": "api/v1",
3636
"basePath": "/app",
37+
"cstarBaseUrl": "https://cstar-dev.apps.gold.devops.gov.bc.ca",
38+
"tenantFeatureEnabled": false,
3739
"oidc": {
3840
"clientId": "chefs-frontend-localhost-5300",
3941
"realm": "standard",
@@ -105,6 +107,14 @@
105107
}
106108
}
107109
},
110+
"cstar": {
111+
"tenantFeatureEnabled": false,
112+
"endpoint": "https://cstar-dev.apps.gold.devops.gov.bc.ca/api/v1/",
113+
"listUserTenantsPath": "users/{userId}/tenants",
114+
"listGroupsForUserForTenantPath": "tenants/{tenantId}/users/{userId}/groups/shared-service-roles",
115+
"listGroupsForTenant": "tenants/{tenantId}/groups",
116+
"listTenantUsersPath": "tenants/{tenantId}/users"
117+
},
108118
"customBcAddressFormioComponent": {
109119
"apikey": "xxxxxxxxxxxxxxx",
110120
"bcAddressURL": "https://geocoder.api.gov.bc.ca/addresses.json",

.devcontainer/chefs_local/test.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@
9797
}
9898
}
9999
},
100+
"cstar": {
101+
"tenantFeatureEnabled": true,
102+
"endpoint": "https://cstar-dev.apps.gold.devops.gov.bc.ca/api/v1/",
103+
"listUserTenantsPath": "users/{userId}/tenants",
104+
"listGroupsForUserForTenantPath": "tenants/{tenantId}/users/{userId}/groups/shared-service-roles",
105+
"listGroupsForTenant": "tenants/{tenantId}/groups",
106+
"listTenantUsersPath": "tenants/{tenantId}/users"
107+
},
100108
"customBcAddressFormioComponent": {
101109
"apikey": "xxxxxxxxxxxxxxx",
102110
"bcAddressURL": "https://geocoder.api.gov.bc.ca/addresses.json",

.github/actions/deploy-to-environment/action.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,20 @@ runs:
117117
oc process --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f openshift/clamav.cm.yaml -p APP_NAME=${{ inputs.acronym }} -p JOB_NAME=${{ inputs.job_name }} --param-file=openshift/clamav.${{ inputs.namespace_environment }}.param -o yaml | oc apply --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f -
118118
fi
119119
120+
- name: Deploy CSTAR ConfigMaps
121+
shell: bash
122+
env:
123+
JOB_NAME: ${{ inputs.job_name }}
124+
NAMESPACE_PREFIX: ${{ inputs.namespace_prefix }}
125+
NAMESPACE_ENVIRONMENT: ${{ inputs.namespace_environment }}
126+
ACRONYM: ${{ inputs.acronym }}
127+
run: |
128+
if [[ "${JOB_NAME}" == pr-* ]]; then
129+
oc process --namespace ${NAMESPACE_PREFIX}-${NAMESPACE_ENVIRONMENT} -f openshift/cstar.cm.yaml -p APP_NAME=${ACRONYM} -p JOB_NAME=${JOB_NAME} --param-file=openshift/cstar.pr.param -o yaml | oc apply --namespace ${NAMESPACE_PREFIX}-${NAMESPACE_ENVIRONMENT} -f -
130+
else
131+
oc process --namespace ${NAMESPACE_PREFIX}-${NAMESPACE_ENVIRONMENT} -f openshift/cstar.cm.yaml -p APP_NAME=${ACRONYM} -p JOB_NAME=${JOB_NAME} --param-file=openshift/cstar.${NAMESPACE_ENVIRONMENT}.param -o yaml | oc apply --namespace ${NAMESPACE_PREFIX}-${NAMESPACE_ENVIRONMENT} -f -
132+
fi
133+
120134
- name: Delete pre-job if it exists
121135
shell: bash
122136
run: |

.github/workflows/cypress-ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
type: string
1212

1313
secrets:
14-
Username:
14+
Username:
1515
required: true
1616
Password:
1717
required: true
@@ -28,14 +28,14 @@ jobs:
2828
with:
2929
ref: ${{ inputs.pr_branch }} # Uses the PR branch from input
3030
fetch-depth: 0 # Ensures the full history is fetched
31-
31+
3232
- name: Setup Node.js
3333
uses: actions/setup-node@v5
3434
with:
35-
node-version: '22'
35+
node-version: '22'
3636
cache: 'npm'
3737
cache-dependency-path: 'tests/functional/cypress/package-lock.json'
38-
38+
3939
- name: cypress install
4040
uses: cypress-io/github-action@82482149c343a5dee155d22104111b9319f9dd45 # SHA for v7
4141
with:

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,9 @@ realm-export.json
8484
chefs_build
8585
tests/functional/cypress/core
8686
dummy
87+
88+
# Ignore Windows reserved device files anywhere
89+
**/nul
90+
91+
# Claude Code configuration
92+
.claude/

app/config/custom-environment-variables.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"adminDashboardUrl": "VITE_ADMIN_DASHBOARD_URL",
3737
"apiPath": "FRONTEND_APIPATH",
3838
"basePath": "VITE_FRONTEND_BASEPATH",
39+
"cstarBaseUrl": "CSTAR_BASE_URL",
40+
"tenantFeatureEnabled": "TENANT_FEATURE_ENABLED",
3941
"oidc": {
4042
"clientId": "OIDC_CLIENTID",
4143
"realm": "OIDC_REALM",
@@ -109,5 +111,13 @@
109111
"gateway": {
110112
"jwtSecret": "GATEWAY_JWTSECRET",
111113
"jwtLifetime": "GATEWAY_JWTLIFETIME"
114+
},
115+
"cstar": {
116+
"tenantFeatureEnabled": "TENANT_FEATURE_ENABLED",
117+
"endpoint": "CSTAR_ENDPOINT",
118+
"listUserTenantsPath": "CSTAR_LIST_USER_TENANTS_PATH",
119+
"listGroupsForUserForTenantPath": "CSTAR_LIST_GROUPS_FOR_USER_FOR_TENANT_PATH",
120+
"listGroupsForTenant": "CSTAR_LIST_GROUPS_FOR_TENANT",
121+
"listTenantUsersPath": "CSTAR_LIST_TENANT_USERS_PATH"
112122
}
113123
}

app/config/default.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
"adminDashboardUrl": "",
3535
"apiPath": "api/v1",
3636
"basePath": "/app",
37+
"cstarBaseUrl": "https://cstar-dev.apps.gold.devops.gov.bc.ca",
38+
"tenantFeatureEnabled": false,
3739
"oidc": {
3840
"clientId": "chefs-frontend-localhost-5300",
3941
"realm": "standard",
@@ -105,6 +107,14 @@
105107
}
106108
}
107109
},
110+
"cstar": {
111+
"tenantFeatureEnabled": false,
112+
"endpoint": "https://cstar-dev.apps.gold.devops.gov.bc.ca/api/v1/",
113+
"listUserTenantsPath": "users/{userId}/tenants",
114+
"listGroupsForUserForTenantPath": "tenants/{tenantId}/users/{userId}/groups/shared-service-roles",
115+
"listGroupsForTenant": "tenants/{tenantId}/groups",
116+
"listTenantUsersPath": "tenants/{tenantId}/users"
117+
},
108118
"customBcAddressFormioComponent": {
109119
"apikey": "xxxxxxxxxxxxxxx",
110120
"bcAddressURL": "https://geocoder.api.gov.bc.ca/addresses.json",
20.1 KB
Loading
700 KB
Loading
941 KB
Loading

0 commit comments

Comments
 (0)