Skip to content

Commit 47178ad

Browse files
jpraynaudjpraynaud
authored
Merge pull request #2448 from input-output-hk/jpraynaud/2410-custom-origin-tags-infra
Feat: support custom origin tags in infra
2 parents f8769b2 + b6f8da3 commit 47178ad

File tree

9 files changed

+18
-1
lines changed

9 files changed

+18
-1
lines changed

‎.github/workflows/actions/deploy-terraform-infrastructure/action.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ inputs:
164164
description: Mithril aggregator ancillary signer JSON credentials to access GCP KMS (used with mithril_aggregator_ancillary_signer_type='gcp-kms').
165165
required: false
166166
default: ""
167+
mithril_aggregator_custom_origin_tag_white_list:
168+
description: Mithril aggregator origin tags white list used by the mithril aggregator (comma separated list of tags).
169+
required: false
170+
default: ""
167171
prometheus_auth_username:
168172
description: Prometheus metrics endpoint username.
169173
required: false
@@ -273,6 +277,7 @@ runs:
273277
mithril_aggregator_ancillary_signer_secret_key = "${{ inputs.mithril_aggregator_ancillary_signer_secret_key }}"
274278
mithril_aggregator_ancillary_signer_gcp_kms_resource_name = "${{ inputs.mithril_aggregator_ancillary_signer_gcp_kms_resource_name }}"
275279
mithril_aggregator_ancillary_signer_gcp_kms_credentials = "${{ steps.prepare.outputs.mithril_aggregator_ancillary_signer_gcp_kms_credentials_base64 }}"
280+
mithril_aggregator_custom_origin_tag_white_list = "${{ inputs.mithril_aggregator_custom_origin_tag_white_list }}"
276281
prometheus_auth_username = "${{ inputs.prometheus_auth_username }}"
277282
prometheus_auth_password = "${{ inputs.prometheus_auth_password }}"
278283
prometheus_ingest_host = "${{ inputs.prometheus_ingest_host }}"

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@ jobs:
732732
mithril_aggregator_ancillary_signer_secret_key: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_SECRET_KEY }}
733733
mithril_aggregator_ancillary_signer_gcp_kms_resource_name: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_RESOURCE_NAME }}
734734
mithril_aggregator_ancillary_signer_gcp_kms_credentials: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_CREDENTIALS }}
735+
mithril_aggregator_custom_origin_tag_white_list: ${{ vars.AGGREGATOR_CUSTOM_ORIGIN_TAG_WHITE_LIST }}
735736
prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
736737
prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
737738
prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }}

‎.github/workflows/pre-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ jobs:
234234
mithril_aggregator_ancillary_signer_secret_key: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_SECRET_KEY }}
235235
mithril_aggregator_ancillary_signer_gcp_kms_resource_name: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_RESOURCE_NAME }}
236236
mithril_aggregator_ancillary_signer_gcp_kms_credentials: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_CREDENTIALS }}
237+
mithril_aggregator_custom_origin_tag_white_list: ${{ vars.AGGREGATOR_CUSTOM_ORIGIN_TAG_WHITE_LIST }}
237238
prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
238239
prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
239240
prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ jobs:
172172
mithril_aggregator_ancillary_signer_secret_key: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_SECRET_KEY }}
173173
mithril_aggregator_ancillary_signer_gcp_kms_resource_name: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_RESOURCE_NAME }}
174174
mithril_aggregator_ancillary_signer_gcp_kms_credentials: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_CREDENTIALS }}
175+
mithril_aggregator_custom_origin_tag_white_list: ${{ vars.AGGREGATOR_CUSTOM_ORIGIN_TAG_WHITE_LIST }}
175176
prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
176177
prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
177178
prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }}

‎.github/workflows/test-deploy-network.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ jobs:
188188
mithril_aggregator_ancillary_signer_secret_key: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_SECRET_KEY }}
189189
mithril_aggregator_ancillary_signer_gcp_kms_resource_name: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_RESOURCE_NAME }}
190190
mithril_aggregator_ancillary_signer_gcp_kms_credentials: ${{ secrets.AGGREGATOR_ANCILLARY_SIGNER_GCP_KMS_CREDENTIALS }}
191+
mithril_aggregator_custom_origin_tag_white_list: ${{ vars.AGGREGATOR_CUSTOM_ORIGIN_TAG_WHITE_LIST }}
191192
prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
192193
prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
193194
prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }}

‎mithril-infra/assets/docker/docker-compose-aggregator-base.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ services:
8080
- CARDANO_TRANSACTIONS_DATABASE_CONNECTION_POOL_SIZE=${CARDANO_TRANSACTIONS_DATABASE_CONNECTION_POOL_SIZE}
8181
- CARDANO_TRANSACTIONS_SIGNING_CONFIG__SECURITY_PARAMETER=${CARDANO_TRANSACTIONS_SIGNING_CONFIG__SECURITY_PARAMETER}
8282
- CARDANO_TRANSACTIONS_SIGNING_CONFIG__STEP=${CARDANO_TRANSACTIONS_SIGNING_CONFIG__STEP}
83+
- CUSTOM_ORIGIN_TAG_WHITE_LIST=${CUSTOM_ORIGIN_TAG_WHITE_LIST}
8384
- PUBLIC_SERVER_URL=${PUBLIC_SERVER_URL}
8485
- ENABLE_METRICS_SERVER=${ENABLE_METRICS_SERVER}
8586
- METRICS_SERVER_IP=${METRICS_SERVER_IP}

‎mithril-infra/assets/infra.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
0.4.3
1+
0.4.4
22

‎mithril-infra/mithril.aggregator.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ EOT
113113
"export CARDANO_TRANSACTIONS_DATABASE_CONNECTION_POOL_SIZE=${var.mithril_aggregator_cardano_transactions_database_connection_pool_size}",
114114
"export CARDANO_TRANSACTIONS_SIGNING_CONFIG__SECURITY_PARAMETER=${var.mithril_aggregator_cardano_transactions_signing_config_security_parameter}",
115115
"export CARDANO_TRANSACTIONS_SIGNING_CONFIG__STEP=${var.mithril_aggregator_cardano_transactions_signing_config_step}",
116+
"export CUSTOM_ORIGIN_TAG_WHITE_LIST='${var.mithril_aggregator_custom_origin_tag_white_list}'",
116117
"export PUBLIC_SERVER_URL=${local.mithril_aggregator_endpoint_url}",
117118
"export AUTH_USER_PASSWORD=$(htpasswd -nb ${var.mithril_aggregator_auth_username} ${var.mithril_aggregator_auth_password})",
118119
"export LEADER_AGGREGATOR_ENDPOINT='${var.mithril_aggregator_leader_aggregator_endpoint}'",

‎mithril-infra/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,12 @@ variable "mithril_aggregator_ancillary_signer_gcp_kms_credentials" {
332332
default = ""
333333
}
334334

335+
variable "mithril_aggregator_custom_origin_tag_white_list" {
336+
type = string
337+
description = "The custom origin tags white list used by the mithril aggregator (comma separated list of tags)"
338+
default = ""
339+
}
340+
335341
variable "prometheus_auth_username" {
336342
type = string
337343
description = "The username for authentication on local prometheus endpoint"

0 commit comments

Comments
 (0)