Merge branch 'vmware:main' into feature/463-update-dependencies-to-la…

…test-package-versions
vmware · Jan 16, 2025 · 2c2f195 · 2c2f195
2 parents aa38264 + 4ad97a6
commit 2c2f195
Show file tree

Hide file tree

Showing 149 changed files with 1,055 additions and 821 deletions.
diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml
@@ -188,13 +188,11 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 
 		<!-- Checks for class design                         -->
 		<!-- See https://checkstyle.org/config_design.html -->
-		<module name="DesignForExtension" />
+		<!-- Uncomment later -->
+		<!-- <module name="DesignForExtension" /> -->
 		<module name="FinalClass" />
 		<module name="HideUtilityClassConstructor" />
 		<module name="InterfaceIsType" />
-		<module name="VisibilityModifier">
-			<property name="protectedAllowed" value="true" />
-		</module>
 
 		<!-- Miscellaneous other checks.                   -->
 		<!-- See https://checkstyle.org/config_misc.html -->

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,10 @@ on:
       - "main" # trigger the workflow for main branch
   workflow_dispatch:
 
+permissions:
+  actions: write
+  contents: write
+
 jobs:
   build:
     strategy:
@@ -31,7 +35,7 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Setup Maven Action
-        uses: s4u/setup-maven-action@v1.17.0
+        uses: s4u/setup-maven-action@4f7fb9d9675e899ca81c6161dadbba0189a4ebb1 #v1.18.0
         with:
           java-version: ${{ matrix.java }}
           java-distribution: "temurin"
@@ -74,7 +78,7 @@ jobs:
 
       - name: Import GPG Key
         if: ${{ github.ref == 'refs/heads/main' }}
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}

diff --git a/.github/workflows/codeql-java.yml b/.github/workflows/codeql-java.yml
diff --git a/.github/workflows/codeql-js.yml b/.github/workflows/codeql-js.yml
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "main"
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v6
         with:
           config-name: release-drafter.yml
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,6 +11,9 @@ jobs:
   release:
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: write
     steps:
 
       - name: Validate actor permissions
@@ -48,7 +51,7 @@ jobs:
         run: sudo apt-get install libxml2-utils
 
       - name: Setup Maven Action
-        uses: s4u/setup-maven-action@v1.17.0
+        uses: s4u/setup-maven-action@4f7fb9d9675e899ca81c6161dadbba0189a4ebb1 #v1.18.0
         with:
           java-version: 17
           java-distribution: "temurin"

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -3,10 +3,16 @@ on:
   pull_request:
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   super-linter:
     name: Lint all code
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -9,6 +9,10 @@ jobs:
   build:
     name: Run vulnerability scan
     runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+      actions: write
+      security-events: write
     env:
       TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db
       TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db
@@ -17,7 +21,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Run Trivy vulnerability scanner in fs mode
-      uses: aquasecurity/[email protected]
+      uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # 0.29.0
       with:
         scan-type: 'fs'
         scan-ref: '.'

diff --git a/common/artifact-manager/pom.xml b/common/artifact-manager/pom.xml
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.core5</groupId>
 			<artifactId>httpcore5</artifactId>
-			<version>5.3.1</version>
+			<version>5.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
@@ -186,7 +186,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>5.14.2</version>
+			<version>5.15.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java
@@ -21,8 +21,8 @@
 import com.vmware.pscoe.iac.artifact.model.abx.AbxConstant;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageContent;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageDescriptor;
-import com.vmware.pscoe.iac.artifact.model.vrang.VraNgSecret;
-import com.vmware.pscoe.iac.artifact.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgSecret;
+import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 import org.apache.commons.lang3.NotImplementedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxReleaseManager.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxReleaseManager.java
@@ -31,7 +31,7 @@
 import com.vmware.pscoe.iac.artifact.model.abx.AbxAction;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxActionVersion;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageDescriptor;
-import com.vmware.pscoe.iac.artifact.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 
 public class AbxReleaseManager {
 	private final Logger logger = LoggerFactory.getLogger(AbxReleaseManager.class);

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/IMPORTANT.md b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/IMPORTANT.md
@@ -0,0 +1,14 @@
+# What?
+
+The structure of this folder is being reworked. Classes are being moved based on solution.
+
+## Progress
+
+- [x] Aria Automation
+- [ ] Aria Orchestrator
+- [ ] Aria Logs
+- [ ] Aria Operations
+- [ ] SSH
+- [ ] vCD
+- [ ] CS
+- [ ] ABX
diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java
@@ -25,6 +25,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerFactory;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerVrops;
 import com.vmware.pscoe.iac.artifact.model.Version;

diff --git a/...act/configuration/ConfigurationVraNg.java → ...ion/configuration/ConfigurationVraNg.java b/...act/configuration/ConfigurationVraNg.java → ...ion/configuration/ConfigurationVraNg.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.configuration;
+package com.vmware.pscoe.iac.artifact.aria.automation.configuration;
 
 import java.net.URISyntaxException;
 import java.util.Properties;
@@ -22,6 +22,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.vmware.pscoe.iac.artifact.configuration.Configuration;
+import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException;
 import com.vmware.pscoe.iac.artifact.model.PackageType;
 
 /**

diff --git a/...iac/artifact/rest/vrang/package-info.java → ...utomation/configuration/package-info.java b/...iac/artifact/rest/vrang/package-info.java → ...utomation/configuration/package-info.java
@@ -1,8 +1,13 @@
+/**
+ * Configuration classes for ARIA.
+ */
+package com.vmware.pscoe.iac.artifact.aria.automation.configuration;
+
 /*-
  * #%L
  * artifact-manager
  * %%
- * Copyright (C) 2023 VMware
+ * Copyright (C) 2023 - 2024 VMware
  * %%
  * Build Tools for VMware Aria
  * Copyright 2023 VMware, Inc.
@@ -12,9 +17,3 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-
-/**
- * Package that represents IAC Artifact.
- *
- */
-package com.vmware.pscoe.iac.artifact.rest.vrang;
diff --git a/...ac/artifact/model/vrang/Identifiable.java → .../aria/automation/models/Identifiable.java b/...ac/artifact/model/vrang/Identifiable.java → .../aria/automation/models/Identifiable.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.model.vrang;
+package com.vmware.pscoe.iac.artifact.aria.automation.models;
 
 /**
  * Interface that makes a Aria automation resource identifiable.

diff --git a/...fact/model/vrang/VraNgApprovalPolicy.java → ...utomation/models/VraNgApprovalPolicy.java b/...fact/model/vrang/VraNgApprovalPolicy.java → ...utomation/models/VraNgApprovalPolicy.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.model.vrang;
+package com.vmware.pscoe.iac.artifact.aria.automation.models;
 
 import com.google.gson.JsonObject;
 

diff --git a/.../artifact/model/vrang/VraNgBlueprint.java → ...ria/automation/models/VraNgBlueprint.java b/.../artifact/model/vrang/VraNgBlueprint.java → ...ria/automation/models/VraNgBlueprint.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.model.vrang;
+package com.vmware.pscoe.iac.artifact.aria.automation.models;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 

diff --git a/.../model/vrang/VraNgCatalogEntitlement.java → ...ation/models/VraNgCatalogEntitlement.java b/.../model/vrang/VraNgCatalogEntitlement.java → ...ation/models/VraNgCatalogEntitlement.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.model.vrang;
+package com.vmware.pscoe.iac.artifact.aria.automation.models;
 
 import java.util.ArrayList;
 import java.util.List;