Skip to content

Commit

Permalink
Merge pull request #2 from pulumi/jkodroff/v0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@stack72
stack72 authored Nov 11, 2021
2 parents 525fb14 + 8926045 commit 9477134
Show file tree
Hide file tree
Showing 45 changed files with 1,673 additions and 1,170 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
**/obj/
Pulumi.*.yaml
**/node_modules/
.DS_Store

**/command-output/

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to terraform-bridge 3.11.0
* Upgrade to pulumi 3.17.0

---

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ prepare::

.PHONY: development provider build_sdks build_nodejs build_dotnet build_go build_python cleanup

development:: install_plugins provider lint_provider build_sdks install_sdks cleanup # Build the provider & SDKs for a development environment
development:: install_plugins provider lint_provider build_sdks install_sdks # Build the provider & SDKs for a development environment

# Required for the codegen action that runs in pulumi/pulumi and pulumi/pulumi-terraform-bridge
build:: install_plugins provider build_sdks install_sdks
Expand Down Expand Up @@ -72,7 +72,7 @@ build_python:: install_plugins tfgen # build the python sdk
cp ../../README.md . && \
python3 setup.py clean --all 2>/dev/null && \
rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \
sed -i.bak -e "s/\$${VERSION}/$(PYPI_VERSION)/g" -e "s/\$${PLUGIN_VERSION}/$(VERSION)/g" ./bin/setup.py && \
sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \
rm ./bin/setup.py.bak && \
cd ./bin && python3 setup.py build sdist

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To use from Python, install using `pip`:

To use from Go, use `go get` to grab the latest version of the library

$ go get github.com/pulumi/pulumi-minio/sdk/go/...
$ go get github.com/pulumi/pulumi-minio/sdk

### .NET

Expand Down
8 changes: 2 additions & 6 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ module github.com/pulumi/pulumi-splunk/examples
go 1.16

require (
github.com/onsi/ginkgo v1.15.0 // indirect
github.com/onsi/gomega v1.10.5 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.0.0
github.com/pulumi/pulumi/sdk/v3 v3.0.0 // indirect
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.17.0
gopkg.in/yaml.v2 v2.3.0 // indirect
)
722 changes: 289 additions & 433 deletions examples/go.sum
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion provider/cmd/pulumi-resource-minio/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
}
},
"minio:index/iamUser:IamUser": {
"description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as minio from \"@pulumi/minio\";\n\nconst testIamUser = new minio.IamUser(\"test\", {\n forceDestroy: true,\n tags: {\n \"tag-key\": \"tag-value\",\n },\n});\n\nexport const test = testIamUser.id;\nexport const status = testIamUser.status;\nexport const secret = testIamUser.secret;\n```\n```python\nimport pulumi\nimport pulumi_minio as minio\n\ntest_iam_user = minio.IamUser(\"testIamUser\",\n force_destroy=True,\n tags={\n \"tag-key\": \"tag-value\",\n })\npulumi.export(\"test\", test_iam_user.id)\npulumi.export(\"status\", test_iam_user.status)\npulumi.export(\"secret\", test_iam_user.secret)\n```\n```csharp\nusing Pulumi;\nusing Minio = Pulumi.Minio;\n\nclass MyStack : Stack\n{\n public MyStack()\n {\n var testIamUser = new Minio.IamUser(\"testIamUser\", new Minio.IamUserArgs\n {\n ForceDestroy = true,\n Tags = \n {\n { \"tag-key\", \"tag-value\" },\n },\n });\n this.Test = testIamUser.Id;\n this.Status = testIamUser.Status;\n this.Secret = testIamUser.Secret;\n }\n\n [Output(\"test\")]\n public Output\u003cstring\u003e Test { get; set; }\n [Output(\"status\")]\n public Output\u003cstring\u003e Status { get; set; }\n [Output(\"secret\")]\n public Output\u003cstring\u003e Secret { get; set; }\n}\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-minio/sdk/go/minio\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\ttestIamUser, err := minio.NewIamUser(ctx, \"testIamUser\", \u0026minio.IamUserArgs{\n\t\t\tForceDestroy: pulumi.Bool(true),\n\t\t\tTags: pulumi.StringMap{\n\t\t\t\t\"tag-key\": pulumi.String(\"tag-value\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"test\", testIamUser.ID())\n\t\tctx.Export(\"status\", testIamUser.Status)\n\t\tctx.Export(\"secret\", testIamUser.Secret)\n\t\treturn nil\n\t})\n}\n```\n{{% /example %}}\n{{% /examples %}}",
"description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as minio from \"@pulumi/minio\";\n\nconst testIamUser = new minio.IamUser(\"test\", {\n forceDestroy: true,\n tags: {\n \"tag-key\": \"tag-value\",\n },\n});\n\nexport const test = testIamUser.id;\nexport const status = testIamUser.status;\nexport const secret = testIamUser.secret;\n```\n```python\nimport pulumi\nimport pulumi_minio as minio\n\ntest_iam_user = minio.IamUser(\"testIamUser\",\n force_destroy=True,\n tags={\n \"tag-key\": \"tag-value\",\n })\npulumi.export(\"test\", test_iam_user.id)\npulumi.export(\"status\", test_iam_user.status)\npulumi.export(\"secret\", test_iam_user.secret)\n```\n```csharp\nusing Pulumi;\nusing Minio = Pulumi.Minio;\n\nclass MyStack : Stack\n{\n public MyStack()\n {\n var testIamUser = new Minio.IamUser(\"testIamUser\", new Minio.IamUserArgs\n {\n ForceDestroy = true,\n Tags = \n {\n { \"tag-key\", \"tag-value\" },\n },\n });\n this.Test = testIamUser.Id;\n this.Status = testIamUser.Status;\n this.Secret = testIamUser.Secret;\n }\n\n [Output(\"test\")]\n public Output\u003cstring\u003e Test { get; set; }\n [Output(\"status\")]\n public Output\u003cstring\u003e Status { get; set; }\n [Output(\"secret\")]\n public Output\u003cstring\u003e Secret { get; set; }\n}\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-minio/sdk/go/minio\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\ttestIamUser, err := minio.NewIamUser(ctx, \"testIamUser\", \u0026minio.IamUserArgs{\n\t\t\tForceDestroy: pulumi.Bool(true),\n\t\t\tTags: pulumi.AnyMap{\n\t\t\t\t\"tag-key\": pulumi.Any(\"tag-value\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"test\", testIamUser.ID())\n\t\tctx.Export(\"status\", testIamUser.Status)\n\t\tctx.Export(\"secret\", testIamUser.Secret)\n\t\treturn nil\n\t})\n}\n```\n{{% /example %}}\n{{% /examples %}}",
"properties": {
"disableUser": {
"type": "boolean",
Expand Down Expand Up @@ -807,6 +807,7 @@
},
"functions": {
"minio:index/getIamPolicyDocument:getIamPolicyDocument": {
"description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as minio from \"@pulumi/minio\";\n\nconst example = minio.getIamPolicyDocument({\n statements: [\n {\n sid: \"1\",\n actions: [\n \"s3:ListAllMyBuckets\",\n \"s3:GetBucketLocation\",\n ],\n resources: [\"arn:aws:s3:::*\"],\n },\n {\n actions: [\"s3:ListBucket\"],\n resources: [\"arn:aws:s3:::state-terraform-s3\"],\n conditions: [{\n test: \"StringLike\",\n variable: \"s3:prefix\",\n values: [\n \"\",\n \"home/\",\n ],\n }],\n },\n {\n actions: [\"s3:PutObject\"],\n resources: [\n \"arn:aws:s3:::state-terraform-s3\",\n \"arn:aws:s3:::state-terraform-s3/*\",\n ],\n },\n ],\n});\nconst testPolicy = new minio.IamPolicy(\"testPolicy\", {policy: example.then(example =\u003e example.json)});\n```\n```python\nimport pulumi\nimport pulumi_minio as minio\n\nexample = minio.get_iam_policy_document(statements=[\n minio.GetIamPolicyDocumentStatementArgs(\n sid=\"1\",\n actions=[\n \"s3:ListAllMyBuckets\",\n \"s3:GetBucketLocation\",\n ],\n resources=[\"arn:aws:s3:::*\"],\n ),\n minio.GetIamPolicyDocumentStatementArgs(\n actions=[\"s3:ListBucket\"],\n resources=[\"arn:aws:s3:::state-terraform-s3\"],\n conditions=[minio.GetIamPolicyDocumentStatementConditionArgs(\n test=\"StringLike\",\n variable=\"s3:prefix\",\n values=[\n \"\",\n \"home/\",\n ],\n )],\n ),\n minio.GetIamPolicyDocumentStatementArgs(\n actions=[\"s3:PutObject\"],\n resources=[\n \"arn:aws:s3:::state-terraform-s3\",\n \"arn:aws:s3:::state-terraform-s3/*\",\n ],\n ),\n])\ntest_policy = minio.IamPolicy(\"testPolicy\", policy=example.json)\n```\n```csharp\nusing Pulumi;\nusing Minio = Pulumi.Minio;\n\nclass MyStack : Stack\n{\n public MyStack()\n {\n var example = Output.Create(Minio.GetIamPolicyDocument.InvokeAsync(new Minio.GetIamPolicyDocumentArgs\n {\n Statements = \n {\n new Minio.Inputs.GetIamPolicyDocumentStatementArgs\n {\n Sid = \"1\",\n Actions = \n {\n \"s3:ListAllMyBuckets\",\n \"s3:GetBucketLocation\",\n },\n Resources = \n {\n \"arn:aws:s3:::*\",\n },\n },\n new Minio.Inputs.GetIamPolicyDocumentStatementArgs\n {\n Actions = \n {\n \"s3:ListBucket\",\n },\n Resources = \n {\n \"arn:aws:s3:::state-terraform-s3\",\n },\n Conditions = \n {\n new Minio.Inputs.GetIamPolicyDocumentStatementConditionArgs\n {\n Test = \"StringLike\",\n Variable = \"s3:prefix\",\n Values = \n {\n \"\",\n \"home/\",\n },\n },\n },\n },\n new Minio.Inputs.GetIamPolicyDocumentStatementArgs\n {\n Actions = \n {\n \"s3:PutObject\",\n },\n Resources = \n {\n \"arn:aws:s3:::state-terraform-s3\",\n \"arn:aws:s3:::state-terraform-s3/*\",\n },\n },\n },\n }));\n var testPolicy = new Minio.IamPolicy(\"testPolicy\", new Minio.IamPolicyArgs\n {\n Policy = example.Apply(example =\u003e example.Json),\n });\n }\n\n}\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-minio/sdk/go/minio\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\texample, err := minio.GetIamPolicyDocument(ctx, \u0026GetIamPolicyDocumentArgs{\n\t\t\tStatements: []GetIamPolicyDocumentStatement{\n\t\t\t\tGetIamPolicyDocumentStatement{\n\t\t\t\t\tSid: \"1\",\n\t\t\t\t\tActions: []string{\n\t\t\t\t\t\t\"s3:ListAllMyBuckets\",\n\t\t\t\t\t\t\"s3:GetBucketLocation\",\n\t\t\t\t\t},\n\t\t\t\t\tResources: []string{\n\t\t\t\t\t\t\"arn:aws:s3:::*\",\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tGetIamPolicyDocumentStatement{\n\t\t\t\t\tActions: []string{\n\t\t\t\t\t\t\"s3:ListBucket\",\n\t\t\t\t\t},\n\t\t\t\t\tResources: []string{\n\t\t\t\t\t\t\"arn:aws:s3:::state-terraform-s3\",\n\t\t\t\t\t},\n\t\t\t\t\tConditions: []GetIamPolicyDocumentStatementCondition{\n\t\t\t\t\t\tGetIamPolicyDocumentStatementCondition{\n\t\t\t\t\t\t\tTest: \"StringLike\",\n\t\t\t\t\t\t\tVariable: \"s3:prefix\",\n\t\t\t\t\t\t\tValues: []string{\n\t\t\t\t\t\t\t\t\"\",\n\t\t\t\t\t\t\t\t\"home/\",\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tGetIamPolicyDocumentStatement{\n\t\t\t\t\tActions: []string{\n\t\t\t\t\t\t\"s3:PutObject\",\n\t\t\t\t\t},\n\t\t\t\t\tResources: []string{\n\t\t\t\t\t\t\"arn:aws:s3:::state-terraform-s3\",\n\t\t\t\t\t\t\"arn:aws:s3:::state-terraform-s3/*\",\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = minio.NewIamPolicy(ctx, \"testPolicy\", \u0026minio.IamPolicyArgs{\n\t\t\tPolicy: pulumi.String(example.Json),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n{{% /example %}}\n{{% /examples %}}",
"inputs": {
"description": "A collection of arguments for invoking getIamPolicyDocument.\n",
"properties": {
Expand Down
8 changes: 4 additions & 4 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ go 1.16
replace (
github.com/aminueza/terraform-provider-minio => github.com/pulumi/terraform-provider-minio v1.2.1-0.20210520110000-3711dbed1389
github.com/hashicorp/go-getter v1.5.0 => github.com/hashicorp/go-getter v1.4.0
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20211019194827-62530c6537a4
github.com/minio/minio => github.com/minio/minio v0.0.0-20210409155609-0ddc4f00756b
github.com/minio/minio-go/v7 => github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78
github.com/shirou/gopsutil/v3 => github.com/shirou/gopsutil/v3 v3.21.1
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20210402103405-f5979773e8ba
)

require (
github.com/aminueza/terraform-provider-minio v1.2.0
github.com/hashicorp/terraform-plugin-sdk v1.9.1
github.com/pulumi/pulumi-terraform-bridge/v3 v3.2.1
github.com/pulumi/pulumi/sdk/v3 v3.5.1
github.com/hashicorp/terraform-plugin-sdk v1.9.1 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.11.0
github.com/pulumi/pulumi/sdk/v3 v3.17.0
)
Loading

0 comments on commit 9477134

Please sign in to comment.