OAS: fix discriminator field for Artifact

Signed-off-by: Isabella Basso do Amaral <[email protected]>
kubeflow · Feb 26, 2024 · 22c4b45 · 22c4b45
1 parent 3496eff
commit 22c4b45
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 74 deletions.
diff --git a/api/openapi/model-registry.yaml b/api/openapi/model-registry.yaml
@@ -971,6 +971,8 @@ components:
     ModelArtifact:
       description: An ML model artifact.
       type: object
+      required:
+        - artifactType
       allOf:
         - $ref: "#/components/schemas/BaseArtifact"
         - $ref: "#/components/schemas/ModelArtifactCreate"
@@ -982,6 +984,8 @@ components:
     DocArtifact:
       description: A document.
       type: object
+      required:
+        - artifactType
       allOf:
         - $ref: "#/components/schemas/BaseArtifact"
         - type: object
@@ -1345,12 +1349,6 @@ components:
       allOf:
         - $ref: "#/components/schemas/BaseArtifactCreate"
         - $ref: "#/components/schemas/BaseResource"
-        - required:
-            - artifactType
-          type: object
-          properties:
-            artifactType:
-              type: string
     ServingEnvironmentList:
       description: List of ServingEnvironments.
       type: object

diff --git a/internal/converter/generated/mlmd_openapi_converter.gen.go b/internal/converter/generated/mlmd_openapi_converter.gen.go
diff --git a/internal/server/openapi/type_asserts.go b/internal/server/openapi/type_asserts.go
@@ -83,15 +83,6 @@ func AssertBaseArtifactCreateConstraints(obj model.BaseArtifactCreate) error {
 
 // AssertBaseArtifactRequired checks if the required fields are not zero-ed
 func AssertBaseArtifactRequired(obj model.BaseArtifact) error {
-	elements := map[string]interface{}{
-		"artifactType": obj.ArtifactType,
-	}
-	for name, el := range elements {
-		if isZero := IsZeroValue(el); isZero {
-			return &RequiredError{Field: name}
-		}
-	}
-
 	return nil
 }
 

diff --git a/pkg/openapi/model_base_artifact.go b/pkg/openapi/model_base_artifact.go
diff --git a/pkg/openapi/model_model_artifact.go b/pkg/openapi/model_model_artifact.go