From 920b79b7c5dab111ee28284422fd89e63545b915 Mon Sep 17 00:00:00 2001 From: Vinaya Mayya Date: Tue, 7 Jan 2025 15:17:38 -0600 Subject: [PATCH 1/5] skip partitions endpoint in paging metrics --- src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py index 25e02d19..cfd314d7 100644 --- a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py +++ b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py @@ -112,7 +112,7 @@ def get_resource_paths(api_base_url: str, verify_cert: bool = True) -> List[str] ] = get_resource_metadata_response(api_base_url, verify_cert) all_paths: List[str] = list(resource_metadata_response["paths"].keys()) # filter out paths that are for get by id, deletes or keyChanges - return list(filter(lambda p: "{id}" not in p and "/deletes" not in p and "/keyChanges" not in p, all_paths)) + return list(filter(lambda p: "{id}" not in p and "/deletes" not in p and "/keyChanges" not in p and "/partitions" not in p, all_paths)) def normalize_resource_paths(resource_paths: List[str]) -> List[str]: From 3f0dfa0b59ca84e39f70d566c02c529eb7aa7346 Mon Sep 17 00:00:00 2001 From: Vinaya Mayya Date: Tue, 7 Jan 2025 15:39:01 -0600 Subject: [PATCH 2/5] formatting change --- .../edfi_paging_test/helpers/api_metadata.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py index cfd314d7..db764e82 100644 --- a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py +++ b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py @@ -111,8 +111,18 @@ def get_resource_paths(api_base_url: str, verify_cert: bool = True) -> List[str] str, Dict[str, str] ] = get_resource_metadata_response(api_base_url, verify_cert) all_paths: List[str] = list(resource_metadata_response["paths"].keys()) - # filter out paths that are for get by id, deletes or keyChanges - return list(filter(lambda p: "{id}" not in p and "/deletes" not in p and "/keyChanges" not in p and "/partitions" not in p, all_paths)) + # filter out paths that are for get by id, deletes, keyChanges or partitions + return list( + filter( + lambda p: ( + "{id}" not in p + and "/deletes" not in p + and "/keyChanges" not in p + and "/partitions" not in p + ) + , all_paths + ) + ) def normalize_resource_paths(resource_paths: List[str]) -> List[str]: From 5aa44e2c751f29494881044e4a8efcceaf2b9423 Mon Sep 17 00:00:00 2001 From: Vinaya Mayya Date: Tue, 7 Jan 2025 18:30:08 -0600 Subject: [PATCH 3/5] action version updates --- .github/workflows/codeql.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/edfi_paging_test.yml | 2 +- .github/workflows/edfi_performance_test.yml | 2 +- .github/workflows/terraform-deploy.yml | 2 +- .github/workflows/terraform-destroy.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dd8ffc12..bfdc7d5f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Install Poetry run: pipx install poetry diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 18012f2b..515d9fa9 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Dependency Review ("Dependabot on PR") uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c # v2.5.1 diff --git a/.github/workflows/edfi_paging_test.yml b/.github/workflows/edfi_paging_test.yml index 86780608..1a235727 100644 --- a/.github/workflows/edfi_paging_test.yml +++ b/.github/workflows/edfi_paging_test.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Install Poetry run: pipx install poetry diff --git a/.github/workflows/edfi_performance_test.yml b/.github/workflows/edfi_performance_test.yml index 17095e93..120af588 100644 --- a/.github/workflows/edfi_performance_test.yml +++ b/.github/workflows/edfi_performance_test.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Install Poetry run: pipx install poetry diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml index 099402ba..651d2dca 100644 --- a/.github/workflows/terraform-deploy.yml +++ b/.github/workflows/terraform-deploy.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3 - name: Create terraform.tfvars run: | diff --git a/.github/workflows/terraform-destroy.yml b/.github/workflows/terraform-destroy.yml index 62c15137..b68260a3 100644 --- a/.github/workflows/terraform-destroy.yml +++ b/.github/workflows/terraform-destroy.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3 - name: Azure Login run: | From 427e459d083de9f1d2c84fbd64e6b12e03a106a9 Mon Sep 17 00:00:00 2001 From: Vinaya Mayya Date: Tue, 7 Jan 2025 18:52:13 -0600 Subject: [PATCH 4/5] indentation fix --- .../edfi_paging_test/helpers/api_metadata.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py index db764e82..a7c7e878 100644 --- a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py +++ b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py @@ -115,10 +115,10 @@ def get_resource_paths(api_base_url: str, verify_cert: bool = True) -> List[str] return list( filter( lambda p: ( - "{id}" not in p - and "/deletes" not in p - and "/keyChanges" not in p - and "/partitions" not in p + "{id}" not in p + and "/deletes" not in p + and "/keyChanges" not in p + and "/partitions" not in p ) , all_paths ) From e1e9bcf91db7657ea472b3e8ea8cd7c9b66a456f Mon Sep 17 00:00:00 2001 From: Vinaya Mayya Date: Tue, 7 Jan 2025 18:59:14 -0600 Subject: [PATCH 5/5] action version updates --- .github/workflows/terraform-deploy.yml | 2 +- .github/workflows/terraform-destroy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml index 651d2dca..531a7507 100644 --- a/.github/workflows/terraform-deploy.yml +++ b/.github/workflows/terraform-deploy.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Setup Terraform uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3 diff --git a/.github/workflows/terraform-destroy.yml b/.github/workflows/terraform-destroy.yml index b68260a3..5676a242 100644 --- a/.github/workflows/terraform-destroy.yml +++ b/.github/workflows/terraform-destroy.yml @@ -41,7 +41,7 @@ jobs: working-directory: ./eng/terraform steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Setup Terraform uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3