Skip to content

Commit

Permalink
Merge pull request #69 from pulumiverse/feature/fix-types
Browse files Browse the repository at this point in the history
Fix types for MachineSecrets
  • Loading branch information
ringods authored Nov 13, 2023
2 parents f646353 + 151bb92 commit 7253a70
Show file tree
Hide file tree
Showing 103 changed files with 6,492 additions and 7,116 deletions.
17 changes: 8 additions & 9 deletions docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import * as talos from "@pulumiverse/talos";

const secrets = new talos.machine.Secrets("secrets", {});

const configuration = talos.machine.ConfigurationOutput({
const configuration = talos.machine.getConfigurationOutput({
clusterName: "exampleCluster",
machineType: "controlplane",
clusterEndpoint: "https://cluster.local:6443",
Expand Down Expand Up @@ -55,7 +55,7 @@ import pulumiverse_talos as talos

secrets = talos.machine.Secrets("secrets")

configuration = talos.machine.configuration_output(cluster_name="exampleCluster",
configuration = talos.machine.get_configuration_output(cluster_name="exampleCluster",
machine_type="controlplane",
cluster_endpoint="https://cluster.local:6443",
machine_secrets=secrets.machine_secrets)
Expand Down Expand Up @@ -98,15 +98,14 @@ func main() {
return err
}

configuration := machine.ConfigurationOutput(ctx, machine.ConfigurationOutputArgs{
configuration := machine.GetConfigurationOutput(ctx, machine.GetConfigurationOutputArgs{
ClusterName: pulumi.String("exampleCluster"),
MachineType: pulumi.String("controlplane"),
ClusterEndpoint: pulumi.String("https://cluster.local:6443"),
MachineSecrets: secrets.MachineSecrets,
}, nil).ApplyT(func(invoke machine.ConfigurationResult) (*string, error) {
return invoke.MachineConfiguration, nil
}).(pulumi.StringPtrOutput)
tmpJSON0, err := json.Marshal(map[string]interface{}{
}, nil)

tmpJSON0, err := json.Marshal(map[string]interface{}{
"machine": map[string]interface{}{
"install": map[string]interface{}{
"disk": "/dev/sdd",
Expand Down Expand Up @@ -159,7 +158,7 @@ return await Deployment.RunAsync(() =>
{
var secrets = new Talos.Machine.Secrets("secrets");

var configuration = Talos.Machine.Configuration.Invoke(new()
var configuration = Talos.Machine.GetConfiguration.Invoke(new()
{
ClusterName = "exampleCluster",
MachineType = "controlplane",
Expand Down Expand Up @@ -213,7 +212,7 @@ description: A minimal Talos program in Pulumi YAML
variables:
configuration:
fn::invoke:
function: talos:machine/configuration:Configuration
function: talos:machine/getConfiguration:getConfiguration
arguments:
clusterName: "exampleCluster"
machineType: "controlplane"
Expand Down
4 changes: 2 additions & 2 deletions examples/dotnet/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{
var secrets = new Talos.Machine.Secrets("secrets");

var configuration = Talos.Machine.Configuration.Invoke(new()
var configuration = Talos.Machine.GetConfiguration.Invoke(new()
{
ClusterName = "exampleCluster",
MachineType = "controlplane",
Expand All @@ -19,7 +19,7 @@
var configurationApply = new Talos.Machine.ConfigurationApply("configurationApply", new()
{
ClientConfiguration = secrets.ClientConfiguration,
MachineConfigurationInput = configuration.MachineConfiguration,
MachineConfigurationInput = configuration,
Node = "10.5.0.2",
ConfigPatches = new[]
{
Expand Down
4 changes: 2 additions & 2 deletions examples/dotnet/talos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="Pulumiverse.Talos" Version="0.1.7" />
<PackageReference Include="Pulumiverse.Talos" Version="0.1.8" />
</ItemGroup>

</Project>
</Project>
89 changes: 87 additions & 2 deletions examples/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,90 @@ module talos
go 1.20

require (
github.com/pulumi/pulumi/sdk/v3 v3.30.0
)
github.com/pulumi/pulumi/sdk/v3 v3.93.0
github.com/pulumiverse/pulumi-talos/sdk v0.1.8
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/charmbracelet/bubbles v0.16.1 // indirect
github.com/charmbracelet/bubbletea v0.24.2 // indirect
github.com/charmbracelet/lipgloss v0.7.1 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.9.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pulumi/esc v0.5.6 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.13.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/grpc v1.57.1 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
)
Loading

0 comments on commit 7253a70

Please sign in to comment.