Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore ability to run acceptance tests in this repo #410

Merged
merged 13 commits into from
May 15, 2023
Merged

Restore ability to run acceptance tests in this repo #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5b2900b
Update test to provision a Zone as part of the test
t0yv0 May 15, 2023
5fd62d9
Fixup example
t0yv0 May 15, 2023
7773673
Do not set zone_id
t0yv0 May 15, 2023
0363409
Fix python test
t0yv0 May 15, 2023
9578a24
Fix Go test
t0yv0 May 15, 2023
dd98293
Fix .NET test
t0yv0 May 15, 2023
17e40a2
Fixup node test
t0yv0 May 15, 2023
67a47c9
Fixup C# example
t0yv0 May 15, 2023
49b79c7
Fixup Go example
t0yv0 May 15, 2023
0f9e391
Fixup Python example
t0yv0 May 15, 2023
4a50293
Update test broken currently
t0yv0 May 15, 2023
1f856d6
Fix Go example compilation
t0yv0 May 15, 2023
5959591
Fixup .NET example
t0yv0 May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/examples_nodejs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ func TestAccRecordTs(t *testing.T) {
func getJSBaseOptions(t *testing.T) integration.ProgramTestOptions {
base := getBaseOptions(t)
baseJS := base.With(integration.ProgramTestOptions{
RunUpdateTest: true,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AccountID property is newly required since the baseline version so this needs to be disabled for now.

Dependencies: []string{
"@pulumi/cloudflare",
},
Expand Down
1 change: 0 additions & 1 deletion examples/examples_py_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ func TestAccRecordPy(t *testing.T) {
func getPythonBaseOptions(t *testing.T) integration.ProgramTestOptions {
base := getBaseOptions(t)
basePython := base.With(integration.ProgramTestOptions{
RunUpdateTest: true,
Dependencies: []string{
filepath.Join("..", "sdk", "python", "bin"),
},
Expand Down
15 changes: 7 additions & 8 deletions examples/examples_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ import (
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
)

func getZoneId(t *testing.T) string {
zoneId := os.Getenv("CLOUDFLARE_ZONE_ID")
if zoneId == "" {
t.Skipf("Skipping test due to missing CLOUDFLARE_ZONE_ID environment variable")
func getAccountId(t *testing.T) string {
id := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
if id == "" {
t.Skipf("Skipping test due to missing CLOUDFLARE_ACCOUNT_ID environment variable")
}

return zoneId
return id
}

func getCwd(t *testing.T) string {
Expand All @@ -28,10 +27,10 @@ func getCwd(t *testing.T) string {
}

func getBaseOptions(t *testing.T) integration.ProgramTestOptions {
zoneId := getZoneId(t)
accountId := getAccountId(t)
return integration.ProgramTestOptions{
Config: map[string]string{
"zone_id": zoneId,
"accountId": accountId,
},
}
}
10 changes: 8 additions & 2 deletions examples/record/csharp/MyStack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@ class MyStack : Stack
public MyStack()
{
var config = new Pulumi.Config();
var zoneId = config.Require("zone_id");
var accountId = config.Require("accountId");

var zone = new Cloudflare.Zone("my-zone", new Cloudflare.ZoneArgs
{
ZoneName = "cs-test-cloudflare-pulumi.com",
AccountId = accountId
});

var foobar = new Cloudflare.Record("foobar", new Cloudflare.RecordArgs
{
Name = "my-record-csharp",
ZoneId = zoneId,
ZoneId = zone.Id,
Value = "162.168.0.14",
Type = "A",
Ttl = 3600,
Expand Down
79 changes: 47 additions & 32 deletions examples/record/go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,72 @@ module github.com/pulumi/pulumi-cloudflare/examples/record/go
go 1.19

require (
github.com/pulumi/pulumi-cloudflare/sdk/v3 v3.1.0
github.com/pulumi/pulumi/sdk/v3 v3.4.0
github.com/pulumi/pulumi-cloudflare/sdk/v5 v5.0.0
github.com/pulumi/pulumi/sdk/v3 v3.67.0
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.1 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cheggaaa/pb v1.0.27 // indirect
github.com/djherbis/times v1.2.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/gofrs/flock v0.7.1 // indirect
github.com/gofrs/uuid v3.3.0+incompatible // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.1.0 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.0 // indirect
github.com/go-git/go-git/v5 v5.6.0 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl/v2 v2.16.1 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/mattn/go-runewidth v0.0.8 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/opentracing/basictracer-go v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // 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/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.9.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.2.0 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.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.22.1+incompatible // indirect
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
go.uber.org/atomic v1.6.0 // 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.12.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // 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