IJMP-2145 Indexes have been added to zowe connections names (#213)

Signed-off-by: Katsiaryna Tsytsenia <[email protected]> Co-authored-by: Katsiaryna Tsytsenia <[email protected]>
zowe · Jan 31, 2025 · 4646b27 · 4646b27
1 parent 2d9acd1
commit 4646b27
Show file tree

Hide file tree

Showing 11 changed files with 1,729 additions and 802 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         product: ["IC-231","IC-233","IC-242","IC-243"]
@@ -41,6 +41,9 @@ jobs:
       pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
     steps:
 
+      - name: Install libsecret-tools
+        run: sudo apt-get install -y libsecret-tools
+
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
 
@@ -101,7 +104,7 @@ jobs:
 
   test_and_sonar:
     needs: [build]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         product: ["IC-231","IC-233","IC-242","IC-243"]
@@ -122,6 +125,9 @@ jobs:
       fail-fast: false
     steps:
 
+      - name: Install libsecret-tools
+        run: sudo apt-get install -y libsecret-tools
+
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
 
@@ -145,7 +151,7 @@ jobs:
       - name: Publish tests result to artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: tests-summary-success-report-${{ matrix.product }}
+          name: tests-report-${{ matrix.product }}
           path: ${{ github.workspace }}/build/reports/tests
 
       - name: Publish code coverage report to artifacts
@@ -174,7 +180,7 @@ jobs:
   verify:
     if: ${{ contains(github.ref, 'refs/heads/release/') || contains(github.ref, 'refs/heads/main') }}
     needs: [build]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         product: ["IC-231","IC-233","IC-242","IC-243"]
@@ -201,6 +207,9 @@ jobs:
           tool-cache: false
           large-packages: false
 
+      - name: Install libsecret-tools
+        run: sudo apt-get install -y libsecret-tools
+
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,11 +13,14 @@ on:
 
 jobs:
   changelog-and-preparations:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
     steps:
+
+      - name: Install libsecret-tools
+        run: sudo apt-get install -y libsecret-tools
 
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
@@ -108,7 +111,7 @@ jobs:
 
   release:
     needs: [changelog-and-preparations]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
     strategy:
@@ -131,6 +134,9 @@ jobs:
       fail-fast: false
     steps:
 
+      - name: Install libsecret-tools
+        run: sudo apt-get install -y libsecret-tools
+
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
 

diff --git a/src/main/kotlin/org/zowe/explorer/utils/miscUtils.kt b/src/main/kotlin/org/zowe/explorer/utils/miscUtils.kt
@@ -31,6 +31,7 @@ import org.zowe.explorer.explorer.WorkingSet
 import org.zowe.explorer.explorer.ui.ExplorerTreeView
 import org.zowe.explorer.explorer.ui.ExplorerUnitTreeNodeBase
 import java.awt.Dimension
+import java.io.InputStream
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -398,3 +399,14 @@ fun createHelpButton(): JButton {
 fun Presentation.addTooltip(tooltipText: String) {
   this.putClientProperty(Key(JComponent.TOOL_TIP_TEXT_KEY), tooltipText)
 }
+
+/**
+ * Function returns an input stream for reading the specified resource.
+ * This function is required for testing purposes
+ * @param classLoader - current ClassLoader
+ * @param strPath - the resource path
+ * @return fn input stream for reading the resource; null if the resource could not be found
+ */
+fun getResourceAsStreamWrappable(classLoader: ClassLoader, strPath: String): InputStream? {
+  return classLoader.getResourceAsStream(strPath)
+}
diff --git a/src/main/kotlin/org/zowe/explorer/zowe/ZoweStartupActivity.kt b/src/main/kotlin/org/zowe/explorer/zowe/ZoweStartupActivity.kt
@@ -42,7 +42,7 @@ fun showNotificationForAddUpdateZoweConfigIfNeeded(project: Project, type: ZoweC
   val zoweConfigService = ZoweConfigService.getInstance(project)
   val zoweConfigState = zoweConfigService.getZoweConfigState(type = type)
 
-  if (zoweConfigState == ZoweConfigState.NEED_TO_ADD) {
+  if (zoweConfigService.findAllZosmfExistingConnection(type).isEmpty() && zoweConfigState == ZoweConfigState.NEED_TO_ADD) {
     val topic = if (type == ZoweConfigType.LOCAL)
       LOCAL_ZOWE_CONFIG_CHANGED
     else
@@ -61,7 +61,7 @@ fun showNotificationForAddUpdateZoweConfigIfNeeded(project: Project, type: ZoweC
         addAction(object : DumbAwareAction("Add $type Zowe Connection") {
           override fun actionPerformed(e: AnActionEvent) {
             ZoweConfigService.getInstance(project)
-              .addOrUpdateZoweConfig(false, true, type)
+              .addOrUpdateZoweConfig(true, true, type)
             hideBalloon()
           }
         }).notify(project)
@@ -76,8 +76,7 @@ fun showNotificationForAddUpdateZoweConfigIfNeeded(project: Project, type: ZoweC
  */
 fun showDialogForDeleteZoweConfigIfNeeded(project: Project, type: ZoweConfigType) {
   val zoweConfigService = ZoweConfigService.getInstance(project)
-  val zoweConfigState = zoweConfigService.getZoweConfigState(type = type)
-  if (zoweConfigState != ZoweConfigState.NEED_TO_ADD && zoweConfigState != ZoweConfigState.NOT_EXISTS) {
+  if (zoweConfigService.findAllZosmfExistingConnection(type).isNotEmpty()) {
     val choice = Messages.showDialog(
       project,
       "$type Zowe config file has been deleted.\n" +

diff --git a/src/main/kotlin/org/zowe/explorer/zowe/service/ZoweConfigService.kt b/src/main/kotlin/org/zowe/explorer/zowe/service/ZoweConfigService.kt
@@ -105,6 +105,12 @@ interface ZoweConfigService {
    */
   fun checkAndRemoveOldZoweConnection(type: ZoweConfigType)
 
+  /**
+   * Finds All existing connections related to zowe.config.json.
+   * @return list of found ConnectionConfigs related to zowe config if it exists or null otherwise.
+   */
+  fun findAllZosmfExistingConnection(type: ZoweConfigType): List<ConnectionConfig>
+
   companion object {
     fun getInstance(project: Project): ZoweConfigService = project.getService(ZoweConfigService::class.java)
     val lock = ReentrantReadWriteLock()