Remove OneOf implementation for Build type (#518)

* this generates the schema as expected * generate SDKs * remove string input handling from implementation
pulumi · Mar 7, 2023 · aedffd8 · aedffd8
1 parent 83e176a
commit aedffd8
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 71 deletions.
diff --git a/provider/cmd/pulumi-resource-docker/schema.json b/provider/cmd/pulumi-resource-docker/schema.json
@@ -4436,14 +4436,7 @@
             "type": "object",
             "inputProperties": {
                 "build": {
-                    "oneOf": [
-                        {
-                            "type": "string"
-                        },
-                        {
-                            "$ref": "#/types/docker:index/dockerBuild:DockerBuild"
-                        }
-                    ],
+                    "$ref": "#/types/docker:index/dockerBuild:DockerBuild",
                     "description": "The Docker build context"
                 },
                 "imageName": {

diff --git a/provider/image.go b/provider/image.go
@@ -275,13 +275,6 @@ func marshalBuildAndApplyDefaults(b resource.PropertyValue) (Build, error) {
 		build.Context = "."
 		return build, nil
 	}
-	if b.IsString() {
-		// use the filepath as context
-		build.Context = b.StringValue()
-		build.Dockerfile = defaultDockerfile
-		return build, nil
-	}
-
 	// read in the build type fields
 	buildObject := b.ObjectValue()
 	// Dockerfile

diff --git a/provider/image_test.go b/provider/image_test.go
@@ -62,17 +62,6 @@ func TestMarshalBuildAndApplyDefaults(t *testing.T) {
 		assert.NoError(t, err)
 	})
 
-	t.Run("String input Build", func(t *testing.T) {
-		expected := Build{
-			Context:    "/twilight/sparkle/bin",
-			Dockerfile: "Dockerfile",
-		}
-		input := resource.NewStringProperty("/twilight/sparkle/bin")
-		actual, err := marshalBuildAndApplyDefaults(input)
-		assert.Equal(t, expected, actual)
-		assert.NoError(t, err)
-	})
-
 	t.Run("Custom Dockerfile with default context", func(t *testing.T) {
 		expected := Build{
 			Context:        ".",

diff --git a/provider/resources.go b/provider/resources.go
@@ -261,14 +261,7 @@ func Provider() tfbridge.ProviderInfo {
 					"build": {
 						Description: "The Docker build context",
 						TypeSpec: schema.TypeSpec{
-							OneOf: []schema.TypeSpec{
-								{
-									Type: "string",
-								},
-								{
-									Ref: "#/types/docker:index/dockerBuild:DockerBuild",
-								},
-							},
+							Ref: "#/types/docker:index/dockerBuild:DockerBuild",
 						},
 					},
 					"skipPush": {

diff --git a/sdk/dotnet/Image.cs b/sdk/dotnet/Image.cs
@@ -116,7 +116,7 @@ public sealed class ImageArgs : global::Pulumi.ResourceArgs
         /// The Docker build context
         /// </summary>
         [Input("build")]
-        public InputUnion<string, Inputs.DockerBuildArgs>? Build { get; set; }
+        public Input<Inputs.DockerBuildArgs>? Build { get; set; }
 
         /// <summary>
         /// The image name

diff --git a/sdk/go/docker/image.go b/sdk/go/docker/image.go
diff --git a/sdk/go/docker/pulumiTypes.go b/sdk/go/docker/pulumiTypes.go
diff --git a/sdk/java/src/main/java/com/pulumi/docker/ImageArgs.java b/sdk/java/src/main/java/com/pulumi/docker/ImageArgs.java
@@ -3,7 +3,6 @@
 
 package com.pulumi.docker;
 
-import com.pulumi.core.Either;
 import com.pulumi.core.Output;
 import com.pulumi.core.annotations.Import;
 import com.pulumi.core.internal.Codegen;
@@ -25,13 +24,13 @@ public final class ImageArgs extends com.pulumi.resources.ResourceArgs {
      * 
      */
     @Import(name="build")
-    private @Nullable Output<Either<String,DockerBuildArgs>> build;
+    private @Nullable Output<DockerBuildArgs> build;
 
     /**
      * @return The Docker build context
      * 
      */
-    public Optional<Output<Either<String,DockerBuildArgs>>> build() {
+    public Optional<Output<DockerBuildArgs>> build() {
         return Optional.ofNullable(this.build);
     }
 
@@ -113,39 +112,19 @@ public Builder(ImageArgs defaults) {
          * @return builder
          * 
          */
-        public Builder build(@Nullable Output<Either<String,DockerBuildArgs>> build) {
+        public Builder build(@Nullable Output<DockerBuildArgs> build) {
             $.build = build;
             return this;
         }
 
-        /**
-         * @param build The Docker build context
-         * 
-         * @return builder
-         * 
-         */
-        public Builder build(Either<String,DockerBuildArgs> build) {
-            return build(Output.of(build));
-        }
-
-        /**
-         * @param build The Docker build context
-         * 
-         * @return builder
-         * 
-         */
-        public Builder build(String build) {
-            return build(Either.ofLeft(build));
-        }
-
         /**
          * @param build The Docker build context
          * 
          * @return builder
          * 
          */
         public Builder build(DockerBuildArgs build) {
-            return build(Either.ofRight(build));
+            return build(Output.of(build));
         }
 
         /**

diff --git a/sdk/nodejs/image.ts b/sdk/nodejs/image.ts
@@ -84,7 +84,7 @@ export class Image extends pulumi.CustomResource {
             if ((!args || args.imageName === undefined) && !opts.urn) {
                 throw new Error("Missing required property 'imageName'");
             }
-            resourceInputs["build"] = args ? args.build : undefined;
+            resourceInputs["build"] = args ? (args.build ? pulumi.output(args.build).apply(inputs.dockerBuildProvideDefaults) : undefined) : undefined;
             resourceInputs["imageName"] = args ? args.imageName : undefined;
             resourceInputs["registry"] = args ? args.registry : undefined;
             resourceInputs["skipPush"] = (args ? args.skipPush : undefined) ?? false;
@@ -109,7 +109,7 @@ export interface ImageArgs {
     /**
      * The Docker build context
      */
-    build?: pulumi.Input<string | inputs.DockerBuild>;
+    build?: pulumi.Input<inputs.DockerBuild>;
     /**
      * The image name
      */