Merge pull request #8014 from jhorvath/oci-port-forward

Adding port forward to OKE Pod

Author: jhorvath

enterprise/cloud.oracle/nbproject/project.xml

@@ -209,6 +209,22 @@
                         <specification-version>1.48</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.api.io</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.29</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.explorer</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.50</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.websvc.restlib</code-name-base>
                     <build-prerequisite/>

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/CloudChildFactory.java

@@ -31,7 +31,7 @@
  *
  * @author Jan Horvath
  */
-public class CloudChildFactory extends ChildFactory<OCIItem> {
+public class CloudChildFactory extends ChildFactory<OCIItem> implements RefreshableKeys {
     private static final Logger LOG = Logger.getLogger(CloudChildFactory.class.getName());
 
     private final OCIItem parent;
@@ -81,6 +81,7 @@ protected Node[] createNodesForKey(OCIItem key) {
         return new Node[]{nodeProvider.apply(key, session)};
     }
 
+    @Override
     public void refreshKeys() {
         refresh(false);
     }

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCINode.java

@@ -26,6 +26,7 @@
 import javax.swing.Action;
 import org.netbeans.modules.cloud.oracle.items.OCIItem;
 import org.openide.nodes.AbstractNode;
+import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.ContextAwareAction;
@@ -42,7 +43,7 @@ public class OCINode extends AbstractNode {
     private RefreshListener refreshListener;
 
     private final OCIItem item;
-    private final CloudChildFactory factory;
+    private final ChildFactory factory;
     private final OCISessionInitiator session;
 
     public OCINode(OCIItem item) {
@@ -53,7 +54,11 @@ public OCINode(OCIItem item, OCISessionInitiator session) {
         this(new CloudChildFactory(session, item), item, session, Lookups.fixed(item, session));
     }
 
-    private OCINode(CloudChildFactory factory, OCIItem item, OCISessionInitiator session, Lookup lookup) {
+    public OCINode(OCIItem item, ChildFactory factory) {
+        this(factory, item, null, Lookups.singleton(item));
+    }
+    
+    private OCINode(ChildFactory factory, OCIItem item, OCISessionInitiator session, Lookup lookup) {
         super(Children.create(factory, true), lookup);
         setName(item.getName());
         this.item = item;
@@ -113,8 +118,8 @@ public static final List<? extends Action> actionsForPath(String path, Lookup lk
 
     public void refresh() {
         RequestProcessor.getDefault().post(() -> {
-            if (factory != null) {
-                factory.refreshKeys();
+            if (factory != null && factory instanceof RefreshableKeys) {
+                ((RefreshableKeys) factory).refreshKeys();
             }
             update(item);
         });

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java

@@ -60,6 +60,9 @@
  * Represents an OCI profile. A profile has a user, tenancy and region
  * assigned.
  */
+@NbBundle.Messages({
+    "LBL_HomeRegion=Region: {0}"
+})
 public final class OCIProfile implements OCISessionInitiator {
 
     /**
@@ -178,9 +181,6 @@ public Tenancy getTenancyData() {
      * @return Optional {@code OCIItem} describing the Tenancy. If
      * Optional.empty() OCI configuration was not found
      */
-    @NbBundle.Messages({
-        "LBL_HomeRegion=Region: {0}"
-    })
     public Optional<TenancyItem> getTenancy() {
         if (configProvider == null) {
             return Optional.empty();

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/RefreshableKeys.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle;
+
+/**
+ *
+ * @author Jan Horvath
+ */
+public interface RefreshableKeys {
+    
+    public void refreshKeys();
+    
+}

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/ConfigMapUploader.java

@@ -24,9 +24,9 @@
 import org.netbeans.api.project.ProjectUtils;
 import static org.netbeans.modules.cloud.oracle.NotificationUtils.showMessage;
 import org.netbeans.modules.cloud.oracle.assets.CloudAssets;
-import org.netbeans.modules.cloud.oracle.assets.ConfigMapProvider;
+import org.netbeans.modules.cloud.oracle.assets.k8s.ConfigMapProvider;
 import org.netbeans.modules.cloud.oracle.assets.Steps;
-import org.netbeans.modules.cloud.oracle.compute.ClusterItem;
+import org.netbeans.modules.cloud.oracle.assets.k8s.ClusterItem;
 import org.netbeans.modules.cloud.oracle.steps.CompartmentStep;
 import org.netbeans.modules.cloud.oracle.steps.ItemTypeStep;
 import org.netbeans.modules.cloud.oracle.steps.ProjectStep;

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/CloudAssets.java

@@ -56,7 +56,7 @@
 import org.netbeans.api.db.explorer.DatabaseConnection;
 import static org.netbeans.modules.cloud.oracle.NotificationUtils.showWarningMessage;
 import org.netbeans.modules.cloud.oracle.bucket.BucketItem;
-import org.netbeans.modules.cloud.oracle.compute.ClusterItem;
+import org.netbeans.modules.cloud.oracle.assets.k8s.ClusterItem;
 import org.netbeans.modules.cloud.oracle.compute.ComputeInstanceItem;
 import org.netbeans.modules.cloud.oracle.database.DatabaseItem;
 import org.netbeans.modules.cloud.oracle.developer.ContainerRepositoryItem;

enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/RootNode.java

@@ -39,7 +39,7 @@ public class RootNode {
 
     private static Node instance = null;
 
-    static synchronized Node instance() {
+    public static synchronized Node instance() {
         if (instance == null) {
             instance = new AbstractNode(
                 Children.create(new AssetsChildren(OCIManager.getDefault().getActiveSession()), true));

…es/cloud/oracle/compute/ClusterItem.java …cloud/oracle/assets/k8s/ClusterItem.javaenterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/compute/ClusterItem.java renamed to enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/k8s/ClusterItem.java enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/compute/ClusterItem.java renamed to enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/k8s/ClusterItem.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.cloud.oracle.compute;
+package org.netbeans.modules.cloud.oracle.assets.k8s;
 
 import com.oracle.bmc.containerengine.ContainerEngineClient;
 import com.oracle.bmc.containerengine.requests.CreateKubeconfigRequest;

…oud/oracle/assets/ConfigMapProvider.java …oracle/assets/k8s/ConfigMapProvider.javaenterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigMapProvider.java renamed to enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/k8s/ConfigMapProvider.java enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigMapProvider.java renamed to enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/k8s/ConfigMapProvider.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.cloud.oracle.assets;
+package org.netbeans.modules.cloud.oracle.assets.k8s;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
@@ -26,7 +26,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import java.util.Map;
 import java.util.TreeMap;
-import org.netbeans.modules.cloud.oracle.compute.ClusterItem;
+import org.netbeans.modules.cloud.oracle.assets.PropertiesGenerator;
 
 /**
  *