Merge remote-tracking branch 'internal/main'

IBM · May 16, 2024 · 0b38bf6 · 0b38bf6
2 parents edcb488 + d420ed2
commit 0b38bf6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue causing images imported into an existing Power VS Workspace to have incorrect Terraform references
 - Fixed an issue causing Power VS Images to not reload when changing the name of an existing Power VS Workspace
 - Fixed an issue causing the LogDNA provider to not be added to `versions.tf` when the instance is enabled
+- Fixed an issue incorrectly causing valid Power VS images to show as invalid on validation
 
 ## 1.15.4
 

diff --git a/client/src/Craig.js b/client/src/Craig.js
@@ -500,7 +500,8 @@ class Craig extends React.Component {
                         "imageID",
                         image.imageID || image.pi_image_id
                       ) &&
-                      !workspace.use_data
+                      !workspace.use_data &&
+                      workspace.zone === zone
                     ) {
                       invalidItems.power_images.push({
                         workspace: workspace.name,
@@ -512,7 +513,8 @@ class Craig extends React.Component {
                   workspace.imageNames.forEach((name) => {
                     if (
                       !splatContains(foundImages, "name", name) &&
-                      !workspace.use_data
+                      !workspace.use_data &&
+                      workspace.zone === zone
                     ) {
                       invalidItems.power_images.push({
                         workspace: workspace.name,

diff --git a/client/src/lib/docs/release-notes.json b/client/src/lib/docs/release-notes.json
@@ -5,7 +5,8 @@
     "fixes": [
       "Fixed an issue causing images imported into an existing Power VS Workspace to have incorrect Terraform references",
       "Fixed an issue causing Power VS Images to not reload when changing the name of an existing Power VS Workspace",
-      "Fixed an issue causing the LogDNA provider to not be added to `versions.tf` when the instance is enabled"
+      "Fixed an issue causing the LogDNA provider to not be added to `versions.tf` when the instance is enabled",
+      "Fixed an issue incorrectly causing valid Power VS images to show as invalid on validation"
     ],
     "upgrade_notes": []
   },