Adding compartment id to all oci items, adding new item types

apache · May 10, 2024 · f1478e8 · f1478e8
1 parent 2444c44
commit f1478e8
Show file tree

Hide file tree

Showing 49 changed files with 1,161 additions and 97 deletions.
diff --git a/enterprise/cloud.oracle/external/binaries-list b/enterprise/cloud.oracle/external/binaries-list
@@ -27,6 +27,11 @@ E46F0CE2219BBCDA94B87D4CB4EF4166DAF6C925 com.oracle.oci.sdk:oci-java-sdk-identit
 A8B7EBCA334E8145469A8FE0365C02A2727218EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.25.3
 AECECCD95E5ED92C73E455B7BA4AC714229041EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.25.3
 0CEE99CE7AA783353D19C56AC9F1AD72485DDBE8 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.25.3
+7084E5AE185230ACB52943C4AA0D0B8B890686A4 com.oracle.oci.sdk:oci-java-sdk-objectstorage:3.25.3
+D9918C04C60741D1BBEFBCC82E9D3B8BE690D412 com.oracle.oci.sdk:oci-java-sdk-objectstorage-generated:3.25.3
+3088420C75219556F803B55D8B71B96D29D1FC80 com.oracle.oci.sdk:oci-java-sdk-objectstorage-extensions:3.25.3
+A7D98B96CEA17F78E4BB9270B4A60FEBFACF6C78 com.oracle.oci.sdk:oci-java-sdk-core:3.25.3
+2236737DDF39CA3A3BABDB58B41F50C47E861EA7 com.oracle.oci.sdk:oci-java-sdk-containerengine:3.25.3
 
 E5F6CAE5CA7ECAAC1EC2827A9E2D65AE2869CADA org.apache.httpcomponents:httpclient:4.5.13
 853B96D3AFBB7BF8CC303FE27EE96836A10C1834 org.apache.httpcomponents:httpcore:4.4.13

diff --git a/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt
@@ -3,7 +3,7 @@ Description: Oracle Cloud Infrastructure SDK for Java
 Origin: https://github.com/oracle/oci-java-sdk
 Version: 3.25.3
 License: UPL-Apache-2.0
-Files: oci-java-sdk-circuitbreaker-3.25.3.jar, oci-java-sdk-common-3.25.3.jar, oci-java-sdk-database-3.25.3.jar, oci-java-sdk-identity-3.25.3.jar, oci-java-sdk-workrequests-3.25.3.jar, oci-java-sdk-adm-3.25.3.jar, oci-java-sdk-devops-3.25.3.jar, oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar, oci-java-sdk-common-httpclient-3.25.3.jar, oci-java-sdk-common-httpclient-jersey-3.25.3.jar oci-java-sdk-keymanagement-3.25.3.jar oci-java-sdk-vault-3.25.3.jar
+Files: oci-java-sdk-circuitbreaker-3.25.3.jar, oci-java-sdk-common-3.25.3.jar, oci-java-sdk-database-3.25.3.jar, oci-java-sdk-identity-3.25.3.jar, oci-java-sdk-workrequests-3.25.3.jar, oci-java-sdk-adm-3.25.3.jar, oci-java-sdk-devops-3.25.3.jar, oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar, oci-java-sdk-common-httpclient-3.25.3.jar, oci-java-sdk-common-httpclient-jersey-3.25.3.jar oci-java-sdk-keymanagement-3.25.3.jar oci-java-sdk-vault-3.25.3.jar oci-java-sdk-containerengine-3.25.3.jar oci-java-sdk-core-3.25.3.jar oci-java-sdk-objectstorage-3.25.3.jar oci-java-sdk-objectstorage-extensions-3.25.3.jar oci-java-sdk-objectstorage-generated-3.25.3.jar 
 
 Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
 

diff --git a/enterprise/cloud.oracle/nbproject/project.properties b/enterprise/cloud.oracle/nbproject/project.properties
@@ -28,13 +28,18 @@ release.external/oci-java-sdk-adm-3.25.3.jar=modules/ext/oci-java-sdk-adm-3.25.3
 release.external/oci-java-sdk-common-httpclient-3.25.3.jar=modules/ext/oci-java-sdk-common-httpclient-3.25.3.jar
 release.external/oci-java-sdk-common-httpclient-jersey-3.25.3.jar=modules/ext/oci-java-sdk-common-httpclient-jersey-3.25.3.jar
 release.external/oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar=modules/ext/oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar
+release.external/oci-java-sdk-objectstorage-3.25.3.jar=modules/ext/oci-java-sdk-objectstorage-3.25.3.jar
+release.external/oci-java-sdk-objectstorage-generated-3.25.3.jar=modules/ext/oci-java-sdk-objectstorage-generated-3.25.3.jar
+release.external/oci-java-sdk-objectstorage-extensions-3.25.3.jar=modules/ext/oci-java-sdk-objectstorage-extensions-3.25.3.jar
+release.external/oci-java-sdk-core-3.25.3.jar=modules/ext/oci-java-sdk-core-3.25.3.jar
+release.external/oci-java-sdk-containerengine-3.25.3.jar=modules/ext/oci-java-sdk-containerengine-3.25.3.jar
 release.external/httpclient-4.5.13.jar=modules/ext/httpclient-4.5.13.jar
 release.external/httpcore-4.4.13.jar=modules/ext/httpcore-4.4.13.jar
 release.external/javassist-3.25.0-GA.jar=modules/ext/javassist-3.25.0-GA.jar
 release.external/resilience4j-circuitbreaker-1.7.1.jar=modules/ext/resilience4j-circuitbreaker-1.7.1.jar
 release.external/resilience4j-core-1.7.1.jar=modules/ext/resilience4j-core-1.7.1.jar
 release.external/vavr-0.10.2.jar=modules/ext/vavr-0.10.2.jar
 release.external/vavr-match-0.10.2.jar=modules/ext/vavr-match-0.10.2.jar
-javac.source=1.8
+javac.source=11
 javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base.fatal.warning=false
diff --git a/enterprise/cloud.oracle/nbproject/project.xml b/enterprise/cloud.oracle/nbproject/project.xml
@@ -279,6 +279,26 @@
                 <runtime-relative-path>ext/oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar</runtime-relative-path>
                 <binary-origin>external/oci-java-sdk-addons-apache-configurator-jersey-3.25.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/oci-java-sdk-objectstorage-3.25.3.jar</runtime-relative-path>
+                <binary-origin>external/oci-java-sdk-objectstorage-3.25.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/oci-java-sdk-objectstorage-generated-3.25.3.jar</runtime-relative-path>
+                <binary-origin>external/oci-java-sdk-objectstorage-generated-3.25.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/oci-java-sdk-objectstorage-extensions-3.25.3.jar</runtime-relative-path>
+                <binary-origin>external/oci-java-sdk-objectstorage-extensions-3.25.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/oci-java-sdk-core-3.25.3.jar</runtime-relative-path>
+                <binary-origin>external/oci-java-sdk-core-3.25.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/oci-java-sdk-containerengine-3.25.3.jar</runtime-relative-path>
+                <binary-origin>external/oci-java-sdk-containerengine-3.25.3.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
                 <binary-origin>external/httpclient-4.5.13.jar</binary-origin>

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java
@@ -220,7 +220,7 @@ public <T> T newClient(Class<T> clientClass) {
     }
 
     private TenancyItem createTenancyItem(Tenancy tenancy) {
-        TenancyItem item = new TenancyItem(OCID.of(tenancy.getId(), "Tenancy"), tenancy.getName());
+        TenancyItem item = new TenancyItem(OCID.of(tenancy.getId(), "Tenancy"), null, tenancy.getName());
         item.setDescription(Bundle.LBL_HomeRegion(tenancy.getHomeRegionKey()));
         return item;
     }

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
@@ -208,7 +208,8 @@ public NotifyDescriptor createInput(NotifyDescriptor.ComposedInput input, int nu
                         AbstractPasswordPanel.generatePassword(),
                         (String) result.get(USERNAME),
                         ((String) result.get(PASSWORD)).toCharArray(),
-                        selectedDatabase.getKey().getValue());
+                        selectedDatabase.getKey().getValue(),
+                        selectedDatabase.getCompartment().getValue());
                 action.addConnection(info);
             } catch (IOException ex) {
                 Exceptions.printStackTrace(ex);
@@ -269,7 +270,7 @@ private abstract class FlatCompartmentItem extends CompartmentItem {
         private String flatName;
 
         private FlatCompartmentItem(Compartment ociComp) {
-            super(OCID.of(ociComp.getId(), "Compartment"), ociComp.getName());      // NOI18N
+            super(OCID.of(ociComp.getId(), "Compartment"), OCID.of(ociComp.getCompartmentId(), "Compartment"), ociComp.getName());      // NOI18N
             setDescription(ociComp.getDescription());
             parentId = OCID.of(ociComp.getCompartmentId(), "Compartment");          // NOI18N
         }

diff --git a/...se/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddDbConnectionToVault.java b/...se/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddDbConnectionToVault.java
@@ -539,7 +539,7 @@ public Step<Result, Result> prepare(Result item) {
             try {
                 List<String> devops = DevopsProjectService.getDevopsProjectOcid();
 
-                Map<String, DevopsProjectItem> allProjectsInCompartment = getDevopsProjects(item.vault.getCompartmentId());
+                Map<String, DevopsProjectItem> allProjectsInCompartment = getDevopsProjects(item.vault.getKey().getValue());
                 Map<String, DevopsProjectItem> filtered = allProjectsInCompartment.entrySet()
                         .stream()
                         .filter(e -> devops.contains(e.getValue().getKey().getValue()))
@@ -695,7 +695,7 @@ private void addDbConnectionToVault(Result item) {
             VaultsClient client = VaultsClient.builder().build(getDefault().getActiveProfile().getConfigProvider());
 
             ListSecretsRequest listSecretsRequest = ListSecretsRequest.builder()
-                    .compartmentId(item.vault.getCompartmentId())
+                    .compartmentId(item.vault.getKey().getValue())
                     .vaultId(item.vault.getKey().getValue())
                     .limit(88)
                     .build();
@@ -710,6 +710,7 @@ private void addDbConnectionToVault(Result item) {
                     put("Username", context.getUser()); //NOI18N
                     put("Password", item.password); //NOI18N
                     put("OCID", (String) context.getConnectionProperties().get("OCID")); //NOI18N
+                    put("CompartmentOCID", (String) context.getConnectionProperties().get("CompartmentOCID")); //NOI18N
                     put("wallet_Password", UUID.randomUUID().toString()); //NOI18N
                 }
             };
@@ -743,7 +744,7 @@ private void addDbConnectionToVault(Result item) {
                             .secretContent(contentDetails)
                             .secretRules(new ArrayList<>(Arrays.asList(SecretReuseRule.builder()
                                     .isEnforcedOnDeletedSecretVersions(false).build())))
-                            .compartmentId(item.vault.getCompartmentId())
+                            .compartmentId(item.vault.getKey().getValue())
                             .vaultId(item.vault.getKey().getValue())
                             .keyId(item.key.getKey().getValue())
                             .build();
@@ -772,7 +773,7 @@ private void addDbConnectionToVault(Result item) {
                     if (source instanceof InlineDeployArtifactSource) {
                         byte[] content = ((InlineDeployArtifactSource) source).getBase64EncodedContent();
                         String srcString = updateProperties(new String(content, StandardCharsets.UTF_8),
-                                item.vault.getCompartmentId(), item.vault.getKey().getValue(), item.datasourceName);
+                                item.vault.getKey().getValue(), item.vault.getKey().getValue(), item.datasourceName);
                         byte[] base64Content = Base64.getEncoder().encode(srcString.getBytes(StandardCharsets.UTF_8));
                         DeployArtifactSource updatedSource = InlineDeployArtifactSource.builder()
                                 .base64EncodedContent(base64Content).build();
@@ -953,7 +954,7 @@ private static abstract class FlatCompartmentItem extends CompartmentItem {
         private String flatName;
 
         private FlatCompartmentItem(Compartment ociComp) {
-            super(OCID.of(ociComp.getId(), "Compartment"), ociComp.getName()); // NOI18N
+            super(OCID.of(ociComp.getId(), "Compartment"), OCID.of(ociComp.getCompartmentId(), "Compartment"), ociComp.getName()); // NOI18N
             setDescription(ociComp.getDescription());
             parentId = OCID.of(ociComp.getCompartmentId(), "Compartment"); // NOI18N
         }
@@ -991,6 +992,7 @@ protected static Map<String, DevopsProjectItem> getDevopsProjects(String compart
             }
             return projects.stream()
                     .map(p -> new DevopsProjectItem(OCID.of(p.getId(), "DevopsProject"), // NOI18N
+                            OCID.of(compartmentId, "Compartment"),
                     p.getName()))
                     .collect(Collectors.toMap(DevopsProjectItem::getName, Function.identity()));
         }

diff --git a/...rise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java b/...rise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java
@@ -150,6 +150,7 @@ void addConnection(DownloadWalletDialog.WalletInfo p) {
                     }
                     Properties props = new Properties();
                     props.put("OCID", p.getOcid()); //NOI18N
+                    props.put("CompartmentOCID", p.getOcid()); //NOI18N
                     String dbUrl = MessageFormat.format(URL_TEMPLATE, connectionName, BaseUtilities.escapeParameters(new String[] { walletPath.toString() }));
                     DatabaseConnection dbConn = DatabaseConnection.create(
                             drivers[0], 

diff --git a/...rise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java b/...rise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java
@@ -92,7 +92,7 @@ static Optional<WalletInfo> showDialog(OCIItem db) {
                 String dbUser = dlgPanel.dbUserField.getText();
                 char[] dbPasswd = dlgPanel.dbPasswordField.getPassword();
                 NbPreferences.forModule(DownloadWalletAction.class).put(LAST_USED_DIR, path); //NOI18N
-                return Optional.of(new WalletInfo(path, generatePassword(), dbUser, dbPasswd, db.getKey().getValue()));
+                return Optional.of(new WalletInfo(path, generatePassword(), dbUser, dbPasswd, db.getKey().getValue(), db.getCompartment().getValue()));
             }
         } else {
             try {
@@ -111,7 +111,7 @@ static Optional<WalletInfo> showDialog(OCIItem db) {
                     return Optional.empty();
                 }
                 char[] password = inp.getInputText().toCharArray();
-                return Optional.of(new WalletInfo(walletsDir.getAbsolutePath(), generatePassword(), username, password, db.getKey().getValue()));
+                return Optional.of(new WalletInfo(walletsDir.getAbsolutePath(), generatePassword(), username, password, db.getKey().getValue(), db.getCompartment().getValue()));
             } catch (IOException ex) {
                 Exceptions.printStackTrace(ex);
             }
@@ -302,18 +302,20 @@ public void changedUpdate(DocumentEvent e) {
     }
 
     static class WalletInfo {
-        private String path;
-        private char[] walletPassword;
-        private String dbUser;
+        private final String path;
+        private final char[] walletPassword;
+        private final String dbUser;
         private char[] dbPassword;
-        private String ocid;
+        private final String ocid;
+        private final String comaprtmentOcid;
 
-        public WalletInfo(String path, char[] walletPassword, String dbUser, char[] dbPassword, String ocid) {
+        public WalletInfo(String path, char[] walletPassword, String dbUser, char[] dbPassword, String ocid, String comaprtmentOcid) {
             this.path = path;
             this.walletPassword = walletPassword;
             this.dbUser = dbUser;
             this.dbPassword = dbPassword;
             this.ocid = ocid;
+            this.comaprtmentOcid = comaprtmentOcid;
         }
 
         public String getPath() {
@@ -335,6 +337,10 @@ public char[] getDbPassword() {
         public String getOcid() {
             return ocid;
         }
+
+        public String getComaprtmentOcid() {
+            return comaprtmentOcid;
+        }
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java
@@ -42,19 +42,13 @@ public class KnowledgeBaseItem extends OCIItem implements URLProvider{
     private static Map<OCID, Collection<Reference<KnowledgeBaseItem>>> itemInstances = new HashMap<>();
 
     protected final Date timeUpdated;
-    protected final String compartmentId;
 
-    public KnowledgeBaseItem(OCID id, String compartmentId, String displayName, Date timeUpdated) {
-        super(id, displayName);
+    public KnowledgeBaseItem(OCID id, OCID compartment, String displayName, Date timeUpdated) {
+        super(id, compartment, displayName);
         this.timeUpdated = timeUpdated;
-        this.compartmentId = compartmentId;
         registerItem();
     }
 
-    public String getCompartmentId() {
-        return compartmentId;
-    }
-
     void registerItem() {
         synchronized (KnowledgeBaseItem.class) {
             itemInstances.computeIfAbsent(getKey(), x -> new ArrayList<>()).add(new WeakReference<>(this));

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java
@@ -19,6 +19,7 @@
 package org.netbeans.modules.cloud.oracle.adm;
 
 import com.oracle.bmc.adm.ApplicationDependencyManagementClient;
+import com.oracle.bmc.adm.model.KnowledgeBase;
 import com.oracle.bmc.adm.model.KnowledgeBaseSummary;
 import com.oracle.bmc.adm.requests.ListKnowledgeBasesRequest;
 import com.oracle.bmc.adm.responses.ListKnowledgeBasesResponse;
@@ -83,12 +84,15 @@ public static ChildrenProvider.SessionAware<CompartmentItem, KnowledgeBaseItem>
                     = session.newClient(ApplicationDependencyManagementClient.class)) {
 
                 ListKnowledgeBasesRequest request = ListKnowledgeBasesRequest.builder()
-                        .compartmentId(compartment.getKey().getValue()).build();
+                        .compartmentId(compartment.getKey().getValue())
+                        .lifecycleState(KnowledgeBase.LifecycleState.Active)
+                        .build();
                 ListKnowledgeBasesResponse response = client.listKnowledgeBases(request);
                 List<KnowledgeBaseSummary> projects = response.getKnowledgeBaseCollection().getItems();
-                return projects.stream().map(p -> new KnowledgeBaseItem(
+                return projects.stream()
+                        .map(p -> new KnowledgeBaseItem(
                         OCID.of(p.getId(), "KnowledgeBase"), // NOI18N 
-                        p.getCompartmentId(),
+                        compartment.getKey(),
                         p.getDisplayName(), p.getTimeUpdated())).collect(Collectors.toList());
             }
         };

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ProjectVulnerability.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ProjectVulnerability.java
@@ -107,7 +107,7 @@ public KnowledgeBaseItem getProjectKnowledgeBase() {
 
             item = new KnowledgeBaseItem(
                     OCID.of(p.getId(), "KnowledgeBase"), // NOI18N 
-                    p.getCompartmentId(),
+                    OCID.of(p.getCompartmentId(), "Compartment"), //NOI18N
                     p.getDisplayName(), p.getTimeUpdated()
                 );
         } catch (IllegalArgumentException | BmcException ex) {
@@ -166,7 +166,7 @@ public CompletableFuture<KnowledgeBaseItem> findKnowledgeBase(String knowledgeBa
                 KnowledgeBase p = response.getKnowledgeBase();
                 result.complete(new KnowledgeBaseItemProxy(
                         OCID.of(p.getId(), "KnowledgeBase"), // NOI18N 
-                        p.getCompartmentId(),
+                        OCID.of(p.getCompartmentId(), "Compartment"),
                         p.getDisplayName(), p.getTimeUpdated())
                 );
             } catch (ThreadDeath x) {
@@ -186,8 +186,8 @@ public CompletableFuture<KnowledgeBaseItem> findKnowledgeBase(String knowledgeBa
      * + presented in the IDE UI.
      */
     static class KnowledgeBaseItemProxy extends KnowledgeBaseItem {
-        public KnowledgeBaseItemProxy(OCID id, String compartmentId, String displayName, Date timeUpdated) {
-            super(id, compartmentId, displayName, timeUpdated);
+        public KnowledgeBaseItemProxy(OCID id, OCID compartment, String displayName, Date timeUpdated) {
+            super(id, compartment, displayName, timeUpdated);
         }
 
         @Override

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityWorker.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityWorker.java
@@ -694,7 +694,7 @@ public AuditResult vulnerabilityAudit(Project project, AuditOptions auditOptions
             auditOptions.setAuditName(projectDisplayName);
         }
         try {
-            return doFindVulnerability(project, kbItem.compartmentId, kbItem.getKey().getValue(), 
+            return doFindVulnerability(project, kbItem.getCompartment().getValue(), kbItem.getKey().getValue(), 
                     projectDisplayName, auditOptions, progressHandle, remoteCall);
         } finally {
             if (remoteCall.get()) {