From 777171b2e1a686f96dc5b0d1ff7760c0d056de3f Mon Sep 17 00:00:00 2001 From: Jose Antonio Carmona Date: Fri, 29 Jul 2022 19:49:50 +0200 Subject: [PATCH] [bitnami/mariadb] Revisit GOSS tests (#11403) * [bitnami/mariadb] Revisit GOSS tests Signed-off-by: Jose Antonio Carmona * Use values.yaml for vars Signed-off-by: Jose Antonio Carmona * Update vars.yaml Signed-off-by: Jose Antonio Carmona * Fix secondary service vars Signed-off-by: Jose Antonio Carmona * Minify vars.yaml Signed-off-by: Jose Antonio Carmona --- .vib/mariadb/goss/goss.yaml | 27 +++++++++------------------ .vib/mariadb/goss/vars.yaml | 13 +++++++++++++ .vib/mariadb/vib-publish.json | 13 ++++++++++--- .vib/mariadb/vib-verify.json | 12 ++++++++++-- 4 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 .vib/mariadb/goss/vars.yaml diff --git a/.vib/mariadb/goss/goss.yaml b/.vib/mariadb/goss/goss.yaml index a0e7b8cd16..71798bdcdc 100644 --- a/.vib/mariadb/goss/goss.yaml +++ b/.vib/mariadb/goss/goss.yaml @@ -1,13 +1,5 @@ -port: - tcp6:3306: - listening: true - ip: - - '::' -process: - mysqld: - running: true -file: - {{ printf "/bitnami/mariadb/data/%s" .Env.MARIADB_DATABASE }}: +file: + /bitnami/mariadb/data/{{ .Vars.auth.database }}: mode: "2700" filetype: directory exists: true @@ -20,15 +12,14 @@ file: "socket=/opt/bitnami/mariadb/tmp/mysql.sock"] exists: true command: - user-id-test: - exec: if [ "$(id -u)" -eq 0 ]; then exit 1; fi - exit-status: 0 - stdout: [] - stderr: [] - create-table-test: - exec: mariadb -h localhost -u root -p"$MARIADB_ROOT_PASSWORD" "$MARIADB_DATABASE" -e 'DROP TABLE IF EXISTS TEST; create table TEST( test_id int auto_increment, test_value int, primary key(test_id)); INSERT INTO TEST (TEST_VALUE) VALUES (1989);SELECT * FROM TEST' + create-table-root-test: + exec: mariadb -h mariadb-primary -u root -P {{ .Vars.primary.service.ports.mysql }} -p'{{ .Vars.auth.rootPassword }}' {{ .Vars.auth.database }} -e 'DROP TABLE IF EXISTS TEST; create table TEST(test_id int auto_increment, test_value int, primary key(test_id)); INSERT INTO TEST (TEST_VALUE) VALUES (1989);SELECT * FROM TEST' exit-status: 0 stdout: - 1989 - stderr: [] + replication-test: + exec: mariadb -h mariadb-primary -u {{ .Vars.auth.username }} -P {{ .Vars.primary.service.ports.mysql }} -p'{{ .Vars.auth.password }}' {{ .Vars.auth.database }} -e 'DROP TABLE IF EXISTS TEST_REP; create table TEST_REP(test_id int auto_increment, test_value varchar(4), primary key(test_id)); INSERT INTO TEST_REP (TEST_VALUE) VALUES (2022)' && sleep 2 && mariadb -h mariadb-secondary -u {{ .Vars.auth.username }} -P {{ .Vars.secondary.service.ports.mysql }} -p'{{ .Vars.auth.password }}' {{ .Vars.auth.database }} -e 'SELECT * FROM TEST_REP' + exit-status: 0 + stdout: + - 2022 timeout: 9000 diff --git a/.vib/mariadb/goss/vars.yaml b/.vib/mariadb/goss/vars.yaml new file mode 100644 index 0000000000..826a47fd1c --- /dev/null +++ b/.vib/mariadb/goss/vars.yaml @@ -0,0 +1,13 @@ +auth: + database: test_database + username: "user" + password: "ComplicatedPassword123!4" + rootPassword: "R0ot)Password" +primary: + service: + ports: + mysql: 80 +secondary: + service: + ports: + mysql: 3306 \ No newline at end of file diff --git a/.vib/mariadb/vib-publish.json b/.vib/mariadb/vib-publish.json index 49e07a362e..f08f82ee44 100644 --- a/.vib/mariadb/vib-publish.json +++ b/.vib/mariadb/vib-publish.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/mariadb" }, - "runtime_parameters": "YXV0aDoKICBkYXRhYmFzZTogdGVzdF9kYXRhYmFzZQogIHVzZXJuYW1lOiAidXNlciIKICBwYXNzd29yZDogIkNvbXBsaWNhdGVkUGFzc3dvcmQxMjMhNCI=", + "runtime_parameters": "YXJjaGl0ZWN0dXJlOiByZXBsaWNhdGlvbgphdXRoOgogIGRhdGFiYXNlOiB0ZXN0X2RhdGFiYXNlCiAgdXNlcm5hbWU6ICJ1c2VyIgogIHBhc3N3b3JkOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgogIHJvb3RQYXNzd29yZDogIlIwb3QpUGFzc3dvcmQiCnByaW1hcnk6CiAgc2VydmljZToKICAgIHR5cGU6IExvYWRCYWxhbmNlcgogICAgcG9ydHM6CiAgICAgIG15c3FsOiA4MApzZWNvbmRhcnk6CiAgc2VydmljZToKICAgIHR5cGU6IENsdXN0ZXJJUAogICAgcG9ydHM6CiAgICAgIG15c3FsOiAzMzA2", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { @@ -38,15 +38,22 @@ "vuln_type": ["OS"] } }, - + { + "action_id": "health-check", + "params": { + "endpoint": "lb-mariadb-primary-mysql", + "app_protocol": "GENERIC" + } + }, { "action_id": "goss", "params": { "resources": { "path": "/.vib/mariadb/goss" }, + "vars_file": "vars.yaml", "remote": { - "workload": "sts-mariadb" + "workload": "sts-mariadb-primary" } } } diff --git a/.vib/mariadb/vib-verify.json b/.vib/mariadb/vib-verify.json index 4b4a05c707..2599dd62d0 100644 --- a/.vib/mariadb/vib-verify.json +++ b/.vib/mariadb/vib-verify.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/mariadb" }, - "runtime_parameters": "YXV0aDoKICBkYXRhYmFzZTogdGVzdF9kYXRhYmFzZQogIHVzZXJuYW1lOiAidXNlciIKICBwYXNzd29yZDogIkNvbXBsaWNhdGVkUGFzc3dvcmQxMjMhNCI=", + "runtime_parameters": "YXJjaGl0ZWN0dXJlOiByZXBsaWNhdGlvbgphdXRoOgogIGRhdGFiYXNlOiB0ZXN0X2RhdGFiYXNlCiAgdXNlcm5hbWU6ICJ1c2VyIgogIHBhc3N3b3JkOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgogIHJvb3RQYXNzd29yZDogIlIwb3QpUGFzc3dvcmQiCnByaW1hcnk6CiAgc2VydmljZToKICAgIHR5cGU6IExvYWRCYWxhbmNlcgogICAgcG9ydHM6CiAgICAgIG15c3FsOiA4MApzZWNvbmRhcnk6CiAgc2VydmljZToKICAgIHR5cGU6IENsdXN0ZXJJUAogICAgcG9ydHM6CiAgICAgIG15c3FsOiAzMzA2", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { @@ -38,14 +38,22 @@ "vuln_type": ["OS"] } }, + { + "action_id": "health-check", + "params": { + "endpoint": "lb-mariadb-primary-mysql", + "app_protocol": "GENERIC" + } + }, { "action_id": "goss", "params": { "resources": { "path": "/.vib/mariadb/goss" }, + "vars_file": "vars.yaml", "remote": { - "workload": "sts-mariadb" + "workload": "sts-mariadb-primary" } } }