From 3972df667852ae5fea50779a2fdec12d1ab4b665 Mon Sep 17 00:00:00 2001 From: Ian Roy Sacbibit Date: Fri, 25 Apr 2025 16:05:52 -0400 Subject: [PATCH 1/2] update infra check service specifiers --- .../aws-mysql-extended-support-check.yml | 2 +- .../aws-postgres-extended-support-check.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml b/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml index fb0f95d..cfa3350 100644 --- a/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml +++ b/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml @@ -3,7 +3,7 @@ version: 1 kind: generic spec: name: AWS MySQL Extended Support Check - serviceSelector: ".[] | .name" + serviceSelector: ".[] | .aliases[0]" successCondition: |- def semver($i): $i | [splits("[.-]") | tonumber? // .]; [.[] | select(.name == $ctx.alias) | .relatedResources.nodes[] | select(.type == "Database") | select(.rawData.engine == "aurora-mysql") | (.rawData.engine_version | split(".mysql_aurora.")) | ((.[0]|tonumber) == 8.0) and (semver(.[1]) >= semver("3.05.2")) ] | all diff --git a/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml b/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml index f749dd1..2646401 100644 --- a/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml +++ b/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml @@ -3,7 +3,7 @@ version: 1 kind: generic spec: name: AWS Postgres Extended Support Check - serviceSelector: ".[] | .name" + serviceSelector: ".[] | .aliases[0]" successCondition: '[.[] | select(.name == $ctx.alias) | .relatedResources.nodes[] | select(.type == "Database") | select(.rawData.engine == "aurora-postgresql") | (.rawData.engine_version | tonumber) >= 12 ] | all' From 653f2c6afb99f087aed96bd7d55e61853a69061e Mon Sep 17 00:00:00 2001 From: Ian Roy Sacbibit Date: Fri, 25 Apr 2025 16:46:20 -0400 Subject: [PATCH 2/2] update successCondition as well --- .../aws-mysql-extended-support-check.yml | 2 +- .../aws-postgres-extended-support-check.yml | 2 +- .../aws-rds-certificate-expiration-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml b/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml index cfa3350..d40808d 100644 --- a/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml +++ b/custom_event_checks/opslevel/service_infrastructure_check/aws-mysql-extended-support-check.yml @@ -6,7 +6,7 @@ spec: serviceSelector: ".[] | .aliases[0]" successCondition: |- def semver($i): $i | [splits("[.-]") | tonumber? // .]; - [.[] | select(.name == $ctx.alias) | .relatedResources.nodes[] | select(.type == "Database") | select(.rawData.engine == "aurora-mysql") | (.rawData.engine_version | split(".mysql_aurora.")) | ((.[0]|tonumber) == 8.0) and (semver(.[1]) >= semver("3.05.2")) ] | all + [.[] | select(.aliases | any(. == $ctx.alias)) | .relatedResources.nodes[] | select(.type == "Database") | select(.rawData.engine == "aurora-mysql") | (.rawData.engine_version | split(".mysql_aurora.")) | ((.[0]|tonumber) == 8.0) and (semver(.[1]) >= semver("3.05.2")) ] | all message: | {% if check.passed %} ### Check passed diff --git a/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml b/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml index 2646401..94fd161 100644 --- a/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml +++ b/custom_event_checks/opslevel/service_infrastructure_check/aws-postgres-extended-support-check.yml @@ -4,7 +4,7 @@ kind: generic spec: name: AWS Postgres Extended Support Check serviceSelector: ".[] | .aliases[0]" - successCondition: '[.[] | select(.name == $ctx.alias) | .relatedResources.nodes[] + successCondition: '[.[] | select(.aliases | any(. == $ctx.alias)) | .relatedResources.nodes[] | select(.type == "Database") | select(.rawData.engine == "aurora-postgresql") | (.rawData.engine_version | tonumber) >= 12 ] | all' message: "{% if check.passed %}\n ### Check passed\n \U0001F389 Congratulations! diff --git a/custom_event_checks/opslevel/service_infrastructure_check/aws-rds-certificate-expiration-check.yml b/custom_event_checks/opslevel/service_infrastructure_check/aws-rds-certificate-expiration-check.yml index eb564da..41e3d56 100644 --- a/custom_event_checks/opslevel/service_infrastructure_check/aws-rds-certificate-expiration-check.yml +++ b/custom_event_checks/opslevel/service_infrastructure_check/aws-rds-certificate-expiration-check.yml @@ -4,7 +4,7 @@ kind: generic spec: name: AWS RDS Certificate Expiration Check serviceSelector: ".[] | .aliases[0]" - successCondition: '[.[] | select(.aliases[0] == $ctx.alias) | .relatedResources.nodes[] + successCondition: '[.[] | select(.aliases | any(. == $ctx.alias)) | .relatedResources.nodes[] | select(.type == "Database") | .rawData | (.ca_certificate_identifier == "rds-ca-rsa2048-g1" or .ca_certificate_identifier == "rds-ca-rsa4096-g1" or .ca_certificate_identifier == "rds-ca-ecc384-g1")]| all'