[bitnami/harbor] Revisit Goss/Cypress tests (#11502)

* [bitnami/harbor] Revisit Goss/Cypress tests Signed-off-by: FraPazGal <fdepaz@vmware.com> * Remove local testing folder Signed-off-by: FraPazGal <fdepaz@vmware.com> * Modify goss tests and update runtime_params Signed-off-by: FraPazGal <fdepaz@vmware.com>
2026-04-02 07:17:26 +08:00 · 2022-08-02 16:41:53 +02:00
parent 6ea7b13ca8
commit 3b422d06ac
7 changed files with 49 additions and 114 deletions
--- a/.vib/harbor/cypress/cypress/integration/harbor_spec.js
+++ b/.vib/harbor/cypress/cypress/integration/harbor_spec.js
@@ -1,20 +1,12 @@
 /// <reference types="cypress" />
 import { random } from '../support/utils';

-it('allows user to log in and log out', () => {
-  cy.login();
-  cy.contains('Invalid user name or password').should('not.exist');
-  cy.contains('button', 'admin').click();
-  cy.contains('Log Out').click();
-  cy.get('#login_username');
-});
-
 it('allows creating a project', () => {
  cy.login();
  cy.visit('/harbor/projects');
  cy.fixture('projects').then((project) => {
-    cy.contains('button', 'New Project').click();
-    cy.get('#create_project_name').type(`${project.newProject.name}-${random}`);
+    cy.contains('New Project').click();
+    cy.get('[id*="project_name"]').type(`${project.newProject.name}-${random}`);
    cy.contains('button', 'OK').should('not.be.disabled').click();
    cy.contains('Created project successfully');
  });
@@ -24,28 +16,31 @@ it('allows creating a registry', () => {
  cy.login();
  cy.visit('/harbor/registries');
  cy.fixture('registries').then((registry) => {
-    cy.contains('button', 'New Endpoint').click();
+    cy.contains('New Endpoint').click();
    cy.get('#adapter').select(`${registry.newRegistry.provider}`);
    cy.get('#destination_name').type(`${registry.newRegistry.name}-${random}`);
+    cy.contains('Test Connection').should('not.be.disabled').click();
+    cy.contains('Connection tested successfully');
    cy.contains('button', 'OK').should('not.be.disabled').click();
    cy.contains('.datagrid-table', `${registry.newRegistry.name}-${random}`);
  });
 });

 it('allows launching a vulnerability scan', () => {
-  const IMAGE_SCANNER = 'Trivy';
  cy.login();
  cy.visit('/harbor/interrogation-services/scanners');
-  cy.contains('.datagrid-table', IMAGE_SCANNER);
-  cy.contains('a', 'Vulnerability').click();
+  cy.contains('.datagrid-row', 'Trivy').within(() => {
+    cy.contains('Enabled');
+  });
+  cy.contains('Vulnerability').click();
  cy.contains('SCAN NOW').click();
  cy.contains('Trigger scan all successfully');
 });

-it('checks system configurations endpoint', () => {
+it('checks every subcomponent status', () => {
  cy.request({
    method: 'GET',
-    url: '/api/v2.0/configurations',
+    url: '/api/v2.0/health',
    form: true,
    auth: {
      username: Cypress.env('username'),
@@ -53,12 +48,6 @@ it('checks system configurations endpoint', () => {
    },
  }).then((response) => {
    expect(response.status).to.eq(200);
-    expect(response.body).to.include.all.keys(
-      'auth_mode',
-      'email_host',
-      'project_creation_restriction',
-      'scan_all_policy',
-      'self_registration'
-    );
+    expect(response.body.status).to.eq('healthy');
  });
 });
--- a/.vib/harbor/goss/goss-portal/goss.yaml
+++ b/.vib/harbor/goss/goss-portal/goss.yaml
@@ -1,36 +0,0 @@
-file:
-  # Checks basic index.html exists
-  /opt/bitnami/harbor/index.html:
-    exists: true
-    filetype: file
-    mode: "0644"
-    owner: root
-    group: root
-  # Checks server configuration exists
-  /opt/bitnami/nginx/conf/nginx.conf:
-    exists: true
-    filetype: file
-    mode: "0644"
-    owner: root
-  # Checks API documentation exists
-  /opt/bitnami/harbor/swagger.json:
-    exists: true
-    filetype: file
-    mode: "0644"
-    owner: root
-    group: root
-http:
-  # Checks Harbor Portal and every subcomponent status
-  http://localhost:8080/api/v2.0/health:
-    method: GET
-    status: 200
-    body:
-      - "!unhealthy"
-command:
-  # Checks the user running the container is non-root
-  user-id-test:
-    exec: id -u
-    exit-status: 0
-    stdout:
-      - 1001
-    stderr: []
--- a/.vib/harbor/goss/goss-registry/goss.yaml
+++ b/.vib/harbor/goss/goss-registry/goss.yaml
@@ -1,27 +0,0 @@
-file:
-  # Checks basic filesystem and binary related to registry management exists
-  /var/lib/registry:
-    exists: true
-    filetype: directory
-    mode: "0775"
-    owner: root
-    group: root
-  /storage:
-    exists: true
-    filetype: directory
-    mode: "2775"
-    owner: root
-  /opt/bitnami/harbor-registry/bin/registry:
-    exists: true
-    filetype: file
-    mode: "0755"
-    owner: root
-    group: root
-command:
-  # Checks the user running the container is non-root
-  user-id-test:
-    exec: id -u
-    exit-status: 0
-    stdout:
-      - 1001
-    stderr: []
--- a/.vib/harbor/goss/goss.yaml
+++ b/.vib/harbor/goss/goss.yaml
@@ -0,0 +1,20 @@
+file:
+  /etc/registry/config.yml:
+    exists: true
+    filetype: file
+    mode: "0644"
+    owner: root
+    contains:
+      - "level: {{ .Vars.logLevel }}"
+      - "rootdirectory: {{ .Vars.persistence.imageChartStorage.filesystem.rootdirectory }}"
+      - "addr: localhost:{{ .Vars.registry.server.containerPorts.debug }}"
+  {{ .Vars.persistence.imageChartStorage.filesystem.rootdirectory }}:
+    exists: true
+    filetype: directory
+    mode: "2775"
+    owner: root
+  /etc/registry/root.crt:
+    exists: true
+    filetype: file
+    mode: "0644"
+    owner: root
--- a/.vib/harbor/goss/vars.yaml
+++ b/.vib/harbor/goss/vars.yaml
@@ -0,0 +1,9 @@
+logLevel: debug
+persistence:
+  imageChartStorage:
+    filesystem:
+      rootdirectory: /storage
+registry:
+  server:
+    containerPorts:
+      debug: 5001
--- a/.vib/harbor/vib-publish.json
+++ b/.vib/harbor/vib-publish.json
@@ -22,7 +22,7 @@
          "url": "{SHA_ARCHIVE}",
          "path": "/bitnami/harbor"
        },
-        "runtime_parameters": "ImFkbWluUGFzc3dvcmQiOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgoiZXhwb3N1cmVUeXBlIjogInByb3h5IgoicG9zdGdyZXNxbCI6CiAgImF1dGgiOgogICAgInBvc3RncmVzUGFzc3dvcmQiOiAiN2RNeExmY3F4TiIKInNlcnZpY2UiOgogICJwb3J0cyI6CiAgICAiaHR0cCI6IDgwCiAgInR5cGUiOiAiTG9hZEJhbGFuY2VyIgo=",
+        "runtime_parameters": "YWRtaW5QYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CmV4cG9zdXJlVHlwZTogcHJveHkKc2VydmljZToKICBwb3J0czoKICAgIGh0dHBzOiA0NDMKICB0eXBlOiBMb2FkQmFsYW5jZXIKbG9nTGV2ZWw6IGRlYnVnCnBlcnNpc3RlbmNlOgogIGltYWdlQ2hhcnRTdG9yYWdlOgogICAgZmlsZXN5c3RlbToKICAgICAgcm9vdGRpcmVjdG9yeTogL3N0b3JhZ2UKcmVnaXN0cnk6CiAgc2VydmVyOgogICAgY29udGFpbmVyUG9ydHM6CiAgICAgIGRlYnVnOiA1MDAx",
        "target_platform": {
          "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}",
          "size": {
@@ -42,22 +42,12 @@
          "action_id": "goss",
          "params": {
            "resources": {
-              "path": "/.vib/harbor/goss/goss-portal"
-            },
-            "remote": {
-              "workload": "deploy-harbor-portal"
-            }
-          }
-        },
-        {
-          "action_id": "goss",
-          "params": {
-            "resources": {
-              "path": "/.vib/harbor/goss/goss-registry"
+              "path": "/.vib/harbor/goss"
            },
            "remote": {
              "workload": "deploy-harbor-registry"
-            }
+            },
+            "vars_file": "vars.yaml"
          }
        },
        {
--- a/.vib/harbor/vib-verify.json
+++ b/.vib/harbor/vib-verify.json
@@ -22,7 +22,7 @@
          "url": "{SHA_ARCHIVE}",
          "path": "/bitnami/harbor"
        },
-        "runtime_parameters": "ImFkbWluUGFzc3dvcmQiOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgoiZXhwb3N1cmVUeXBlIjogInByb3h5IgoicG9zdGdyZXNxbCI6CiAgImF1dGgiOgogICAgInBvc3RncmVzUGFzc3dvcmQiOiAiN2RNeExmY3F4TiIKInNlcnZpY2UiOgogICJwb3J0cyI6CiAgICAiaHR0cCI6IDgwCiAgInR5cGUiOiAiTG9hZEJhbGFuY2VyIgo=",
+        "runtime_parameters": "YWRtaW5QYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CmV4cG9zdXJlVHlwZTogcHJveHkKc2VydmljZToKICBwb3J0czoKICAgIGh0dHBzOiA0NDMKICB0eXBlOiBMb2FkQmFsYW5jZXIKbG9nTGV2ZWw6IGRlYnVnCnBlcnNpc3RlbmNlOgogIGltYWdlQ2hhcnRTdG9yYWdlOgogICAgZmlsZXN5c3RlbToKICAgICAgcm9vdGRpcmVjdG9yeTogL3N0b3JhZ2UKcmVnaXN0cnk6CiAgc2VydmVyOgogICAgY29udGFpbmVyUG9ydHM6CiAgICAgIGRlYnVnOiA1MDAx",
        "target_platform": {
          "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}",
          "size": {
@@ -42,22 +42,12 @@
          "action_id": "goss",
          "params": {
            "resources": {
-              "path": "/.vib/harbor/goss/goss-portal"
-            },
-            "remote": {
-              "workload": "deploy-harbor-portal"
-            }
-          }
-        },
-        {
-          "action_id": "goss",
-          "params": {
-            "resources": {
-              "path": "/.vib/harbor/goss/goss-registry"
+              "path": "/.vib/harbor/goss"
            },
            "remote": {
              "workload": "deploy-harbor-registry"
-            }
+            },
+            "vars_file": "vars.yaml"
          }
        },
        {