From eecbe29613dc8b365f6e916f65141ec4706769c7 Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Wed, 9 Nov 2022 16:49:30 -0800 Subject: [PATCH] Regenerate the .pyi files as left from #11095. --- Makefile | 10 ++++++---- sdk/python/lib/pulumi/runtime/proto/resource_pb2.pyi | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c5aa90352703..57a114c052e4 100644 --- a/Makefile +++ b/Makefile @@ -33,22 +33,24 @@ ensure: .ensure.phony go.ensure $(SUB_PROJECTS:%=%_ensure) @touch .ensure.phony .PHONY: build-proto -PROTO_FILES := $(sort $(shell find proto/ -type f -name '*.proto') proto/generate.sh proto/build-container/Dockerfile $(wildcard proto/build-container/scripts/*)) +PROTO_FILES := $(sort $(shell find proto -type f -name '*.proto') proto/generate.sh proto/build-container/Dockerfile $(wildcard proto/build-container/scripts/*)) +PROTO_CKSUM = cksum ${PROTO_FILES} | sort --key=3 build-proto: @printf "Protobuffer interfaces are ....... " - @if [ "$$(cat proto/.checksum.txt)" = "$$(cksum $(PROTO_FILES))" ]; then \ + @if [ "$$(cat proto/.checksum.txt)" = "`${PROTO_CKSUM}`" ]; then \ printf "\033[0;32mup to date\033[0m\n"; \ else \ printf "\033[0;34mout of date: REBUILDING\033[0m\n"; \ cd proto && ./generate.sh || exit 1; \ - cd ../ && cksum $(PROTO_FILES) > proto/.checksum.txt; \ + cd ../ && ${PROTO_CKSUM} > proto/.checksum.txt; \ printf "\033[0;34mProtobuffer interfaces have been \033[0;32mREBUILT\033[0m\n"; \ fi .PHONY: check-proto check-proto: - @if [ "$$(cat proto/.checksum.txt)" != "$$(cksum $(PROTO_FILES))" ]; then \ + @if [ "$$(cat proto/.checksum.txt)" != "`${PROTO_CKSUM}`" ]; then \ echo "Protobuff checksum doesn't match. Run \`make build-proto\` to rebuild."; \ + ${PROTO_CKSUM} | diff - proto/.checksum.txt; \ exit 1; \ fi diff --git a/sdk/python/lib/pulumi/runtime/proto/resource_pb2.pyi b/sdk/python/lib/pulumi/runtime/proto/resource_pb2.pyi index e60056256d22..a2636e2f41a2 100644 --- a/sdk/python/lib/pulumi/runtime/proto/resource_pb2.pyi +++ b/sdk/python/lib/pulumi/runtime/proto/resource_pb2.pyi @@ -271,6 +271,7 @@ class RegisterResourceRequest(google.protobuf.message.Message): PLUGINDOWNLOADURL_FIELD_NUMBER: builtins.int RETAINONDELETE_FIELD_NUMBER: builtins.int ALIASES_FIELD_NUMBER: builtins.int + DELETEDWITH_FIELD_NUMBER: builtins.int type: builtins.str """the type of the object allocated.""" name: builtins.str @@ -333,6 +334,8 @@ class RegisterResourceRequest(google.protobuf.message.Message): @property def aliases(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[pulumi.alias_pb2.Alias]: """a list of additional aliases that should be considered the same.""" + deletedWith: builtins.str + """if set the engine will not call the resource providers delete method for this resource when specified resource is deleted.""" def __init__( self, *, @@ -362,9 +365,10 @@ class RegisterResourceRequest(google.protobuf.message.Message): pluginDownloadURL: builtins.str = ..., retainOnDelete: builtins.bool = ..., aliases: collections.abc.Iterable[pulumi.alias_pb2.Alias] | None = ..., + deletedWith: builtins.str = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal["customTimeouts", b"customTimeouts", "object", b"object"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal["acceptResources", b"acceptResources", "acceptSecrets", b"acceptSecrets", "additionalSecretOutputs", b"additionalSecretOutputs", "aliasURNs", b"aliasURNs", "aliases", b"aliases", "custom", b"custom", "customTimeouts", b"customTimeouts", "deleteBeforeReplace", b"deleteBeforeReplace", "deleteBeforeReplaceDefined", b"deleteBeforeReplaceDefined", "dependencies", b"dependencies", "ignoreChanges", b"ignoreChanges", "importId", b"importId", "name", b"name", "object", b"object", "parent", b"parent", "pluginDownloadURL", b"pluginDownloadURL", "propertyDependencies", b"propertyDependencies", "protect", b"protect", "provider", b"provider", "providers", b"providers", "remote", b"remote", "replaceOnChanges", b"replaceOnChanges", "retainOnDelete", b"retainOnDelete", "supportsPartialValues", b"supportsPartialValues", "type", b"type", "version", b"version"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal["acceptResources", b"acceptResources", "acceptSecrets", b"acceptSecrets", "additionalSecretOutputs", b"additionalSecretOutputs", "aliasURNs", b"aliasURNs", "aliases", b"aliases", "custom", b"custom", "customTimeouts", b"customTimeouts", "deleteBeforeReplace", b"deleteBeforeReplace", "deleteBeforeReplaceDefined", b"deleteBeforeReplaceDefined", "deletedWith", b"deletedWith", "dependencies", b"dependencies", "ignoreChanges", b"ignoreChanges", "importId", b"importId", "name", b"name", "object", b"object", "parent", b"parent", "pluginDownloadURL", b"pluginDownloadURL", "propertyDependencies", b"propertyDependencies", "protect", b"protect", "provider", b"provider", "providers", b"providers", "remote", b"remote", "replaceOnChanges", b"replaceOnChanges", "retainOnDelete", b"retainOnDelete", "supportsPartialValues", b"supportsPartialValues", "type", b"type", "version", b"version"]) -> None: ... global___RegisterResourceRequest = RegisterResourceRequest