fix: azure hasLocation incorporates endpoint. Fixes #11512 (#11513)

Signed-off-by: Roel Arents <roel.arents@kadaster.nl>
argoproj · Aug 11, 2023 · aff72d0 · aff72d0
1 parent 5797668
commit aff72d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/apis/workflow/v1alpha1/workflow_types.go b/pkg/apis/workflow/v1alpha1/workflow_types.go
@@ -2525,7 +2525,7 @@ func (a *AzureArtifact) SetKey(key string) error {
 }
 
 func (a *AzureArtifact) HasLocation() bool {
-	return a != nil && a.Container != "" && a.Blob != ""
+	return a != nil && a.Endpoint != "" && a.Container != "" && a.Blob != ""
 }
 
 // HDFSArtifact is the location of an HDFS artifact

diff --git a/pkg/apis/workflow/v1alpha1/workflow_types_test.go b/pkg/apis/workflow/v1alpha1/workflow_types_test.go
@@ -328,7 +328,7 @@ func TestArtifactoryArtifact(t *testing.T) {
 }
 
 func TestAzureArtifact(t *testing.T) {
-	a := &AzureArtifact{Blob: "my-blob", AzureBlobContainer: AzureBlobContainer{Container: "my-container"}}
+	a := &AzureArtifact{Blob: "my-blob", AzureBlobContainer: AzureBlobContainer{Endpoint: "my-endpoint", Container: "my-container"}}
 	assert.True(t, a.HasLocation())
 	assert.NoError(t, a.SetKey("my-blob"))
 	key, err := a.GetKey()