fix type conversion

ydkn · Feb 22, 2024 · fa21985 · fa21985
1 parent 2b2bcfe
commit fa21985
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ yarn.lock
 ci-scripts
 /nuget/
 provider/**/schema-embed.json
+go.work.sum
diff --git a/examples/dotnet/provider-k0s.csproj b/examples/dotnet/provider-k0s.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="Pulumi.K0s" Version="0.2.0" />
+		<PackageReference Include="Pulumi.K0s" Version="0.2.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/examples/nodejs/package.json b/examples/nodejs/package.json
@@ -6,6 +6,6 @@
 	"dependencies": {
 		"typescript": "^4.0.0",
 		"@pulumi/pulumi": "^3.0.0",
-		"@pulumi/k0s": "0.2.0"
+		"@pulumi/k0s": "0.2.1"
 	}
 }
diff --git a/examples/python/requirements.txt b/examples/python/requirements.txt
@@ -1,2 +1,2 @@
 pulumi>=3.0.0,<4.0.0
-pulumi-k0s==0.2.0
+pulumi-k0s==0.2.1
diff --git a/go.work b/go.work
@@ -0,0 +1,7 @@
+go 1.21
+
+use (
+	./provider
+	./tests
+	./sdk
+)
diff --git a/provider/internal/k0sctl/cluster.go b/provider/internal/k0sctl/cluster.go
@@ -1,9 +1,11 @@
 package k0sctl
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
+	"gopkg.in/yaml.v3"
 )
 
 type Cluster v1beta1.Cluster
@@ -47,3 +49,23 @@ func (c *Cluster) APIAddress() string {
 
 	return fmt.Sprintf("https://%s:%d", address, port)
 }
+
+// Fix problematic YAML handling with dig
+func (c *Cluster) MarshalYAML() ([]byte, error) {
+	j, err := json.Marshal(c) //nolint:staticcheck
+	if err != nil {
+		return nil, err
+	}
+
+	var iface interface{}
+
+	if err := json.Unmarshal(j, &iface); err != nil {
+		return nil, err
+	}
+
+	return yaml.Marshal(iface)
+}
+
+func (c *Cluster) UnmarshalYAML(b []byte) error {
+	return yaml.Unmarshal(b, c)
+}
diff --git a/sdk/dotnet/version.txt b/sdk/dotnet/version.txt
@@ -1 +1 @@
-0.2.0
+0.2.1