Skip to content

Commit b26c831

Browse files
julie-gordonjulie-gordon
authored
Merge pull request #28 from docusign/main
Update hosted version for multi-record read
2 parents 960872d + 3744604 commit b26c831

File tree

8 files changed

+163
-8
lines changed

8 files changed

+163
-8
lines changed

‎.github/workflows/terraform-deploy.yml‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: Terraform CI/CD
2+
3+
on:
4+
pull_request:
5+
branches: [deploy]
6+
push:
7+
branches: [deploy]
8+
9+
permissions:
10+
id-token: write # Required for Azure OIDC
11+
contents: write # Needed to commit manifest updates
12+
pull-requests: write # Needed to open PRs
13+
14+
env:
15+
TF_VAR_application_name: ${{ vars.APPLICATION_NAME }}
16+
TF_VAR_application_oauth_client_id: ${{ secrets.APPLICATION_OAUTH_CLIENT_ID }}
17+
TF_VAR_application_oauth_client_secret: ${{ secrets.APPLICATION_OAUTH_CLIENT_SECRET }}
18+
TF_VAR_location: ${{ vars.AZURE_LOCATION }}
19+
TF_VAR_execution_mode: ci
20+
ACR_NAME: ${{ vars.ACR_NAME }}
21+
22+
jobs:
23+
terraform:
24+
runs-on: ubuntu-latest
25+
26+
steps:
27+
# Checkout repo
28+
- name: Checkout repository
29+
uses: actions/checkout@v4
30+
31+
# Install Terraform
32+
- name: Setup Terraform
33+
uses: hashicorp/setup-terraform@v2
34+
with:
35+
terraform_version: 1.10.5
36+
37+
# Temporarily remove repo provider configuration
38+
- name: Disable repo azurerm provider
39+
working-directory: terraform/azure
40+
run: mv providers.tf providers.tf.bak
41+
42+
# Create CI-only backend + OIDC provider
43+
- name: Create CI Azure backend/provider
44+
working-directory: terraform/azure
45+
run: |
46+
cat <<EOF > azure_ci.tf
47+
terraform {
48+
backend "azurerm" {}
49+
}
50+
51+
provider "azurerm" {
52+
features {}
53+
}
54+
EOF
55+
56+
- name: Configure Azure OIDC environment
57+
run: |
58+
echo "ARM_USE_OIDC=true" >> $GITHUB_ENV
59+
echo "ARM_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}" >> $GITHUB_ENV
60+
echo "ARM_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}" >> $GITHUB_ENV
61+
echo "ARM_SUBSCRIPTION_ID=${{ secrets.AZURE_SUBSCRIPTION_ID }}" >> $GITHUB_ENV
62+
63+
- name: Azure Login
64+
uses: azure/login@v1
65+
with:
66+
client-id: ${{ secrets.AZURE_CLIENT_ID }}
67+
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
68+
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
69+
70+
- name: Login to ACR
71+
run: |
72+
TOKEN=$(az acr login --name ${{ env.ACR_NAME }} --expose-token --output tsv --query accessToken)
73+
docker login -u 00000000-0000-0000-0000-000000000000 --password-stdin ${{ env.ACR_NAME }}.azurecr.io <<< $TOKEN
74+
75+
- name: Terraform Init
76+
working-directory: terraform/azure
77+
run: |
78+
terraform init -upgrade -reconfigure\
79+
-backend-config="resource_group_name=${{ vars.AZURE_RG }}" \
80+
-backend-config="storage_account_name=${{ vars.AZURE_STORAGE_ACCOUNT }}" \
81+
-backend-config="container_name=${{ vars.AZURE_CONTAINER }}" \
82+
-backend-config="key=${{ vars.AZURE_TFSTATE_KEY }}" \
83+
-backend-config="use_oidc=true"
84+
85+
- name: Debug backend values
86+
run: |
87+
terraform state pull | head -20
88+
echo "RG=${{ vars.AZURE_RG }}"
89+
echo "SA=${{ vars.AZURE_STORAGE_ACCOUNT }}"
90+
echo "CONTAINER=${{ vars.AZURE_CONTAINER }}"
91+
echo "KEY=${{ vars.AZURE_TFSTATE_KEY }}"
92+
93+
# Terraform plan (PR only)
94+
- name: Terraform Plan
95+
if: github.event_name == 'pull_request'
96+
working-directory: terraform/azure
97+
run: terraform plan -out=tfplan
98+
99+
# Terraform apply (merge to main only)
100+
- name: Terraform Apply
101+
if: github.event_name == 'push'
102+
working-directory: terraform/azure
103+
run: |
104+
terraform plan -out=tfplan
105+
terraform apply -auto-approve tfplan
106+
107+
# Cleanup CI-only files
108+
- name: Cleanup CI Terraform files
109+
working-directory: terraform/azure
110+
run: |
111+
rm -f azure_ci.tf
112+
mv providers.tf.bak providers.tf

‎src/services/dataio.service.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,19 @@ export const searchRecords = (req: IReq<SearchRecordsBody>, res: IRes): IRes =>
200200
}
201201
const db: FileDB = new FileDB(generateFilePath(query.from));
202202
const data: object[] = db.readFile();
203-
const index: number = QueryExecutor.execute(query, data);
204-
if (index === -1) {
203+
const indices: number[] = QueryExecutor.executeAll(query, data);
204+
if (!indices || indices.length === 0) {
205205
console.log('No results found');
206206
return res.json({ records: [] })
207207
}
208-
const dataResult: object = data[index];
209-
convertDateToISO8601(dataResult, query.from);
210208

211-
return res.json({ records: [ResultRehydrator.filterAndRehydrate(query.attributesToSelect, data[index])] });
209+
const records = indices.map((idx: number) => {
210+
const record: object = data[idx];
211+
convertDateToISO8601(record, query.from);
212+
return ResultRehydrator.filterAndRehydrate(query.attributesToSelect, record);
213+
});
214+
215+
return res.json({ records });
212216
} catch (err) {
213217
console.log(`Encountered an error searching data: ${err.message}`);
214218
return res.status(500).json(generateErrorResponse(ErrorCode.INTERNAL_ERROR, err)).send();

‎src/utils/queryExecutor.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,23 @@ export class QueryExecutor {
3131
return -1;
3232
}
3333

34+
/**
35+
* Executes a query on the given input data and returns all matching indices.
36+
* @param {IQuery} query - The query to execute.
37+
* @param {object[]} inputData - The data to query against.
38+
* @returns {number[]} An array of indices for matching records (empty if none).
39+
*/
40+
public static executeAll(query: IQuery, inputData: object[]): number[] {
41+
const operation: OperationUnion = query.queryFilter.operation;
42+
const results: number[] = [];
43+
for (let index: number = 0; index < inputData.length; index++) {
44+
if (this.evaluateOperation(operation, inputData[index])) {
45+
results.push(index);
46+
}
47+
}
48+
return results;
49+
}
50+
3451
/**
3552
* Evaluates an operation on a given record.
3653
* @param {OperationUnion} operation - The operation to evaluate.

‎terraform/azure/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ module "manifest" {
6161
"${basename(dirname(var.manifest_files_paths[count.index]))}.${basename(var.manifest_files_paths[count.index])}"
6262
])
6363

64+
execution_mode = var.execution_mode
6465
client_id = local.application_oauth_client_id
6566
client_secret = local.application_oauth_client_secret
6667
base_url = local.application_service_url

‎terraform/azure/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,3 +276,9 @@ variable "tags" {
276276
description = "A map of the tags to apply to various resources"
277277
default = {}
278278
}
279+
280+
variable "execution_mode" {
281+
description = "Execution mode: 'local' or 'ci'"
282+
type = string
283+
default = "local"
284+
}

‎terraform/common/modules/template/main.tf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ locals {
2525
]...
2626
)
2727
])
28-
29-
output_file_path = nonsensitive(local_sensitive_file.this.filename != "/dev/null" ? local_sensitive_file.this.filename : "")
3028
}
3129

3230
resource "local_sensitive_file" "this" {
31+
count = var.execution_mode == "local" ? 1 : 0
3332
content = local.output_file_content
3433
filename = local.enabled ? var.output_file_path : "/dev/null"
3534
}
35+
36+
output "manifest_file_path" {
37+
description = "The intended output file path"
38+
value = var.output_file_path
39+
}

‎terraform/common/modules/template/outputs.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
output "output_file_path" {
22
description = "The absolute path to the output file"
3-
value = local.output_file_path
3+
value = var.output_file_path
44
}

‎terraform/common/modules/template/variables.tf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
variable "execution_mode" {
2+
description = "Controls whether Terraform writes manifests to disk (local) or only renders them (ci)"
3+
type = string
4+
default = "local"
5+
6+
validation {
7+
condition = contains(["local", "ci"], var.execution_mode)
8+
error_message = "execution_mode must be 'local' or 'ci'."
9+
}
10+
}
11+
112
variable "input_file_path" {
213
description = "The absolute path to the input file. If it doesn't exist, the module will not do anything"
314
type = string

0 commit comments

Comments
 (0)