Merge pull request #22698 from hashicorp/protobuf-regenerated

Regenerate protobuf files under latest versions

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/go-test/deep v1.0.3
 	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
 	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.1
+	github.com/golang/protobuf v1.3.2
 	github.com/google/go-cmp v0.3.0
 	github.com/google/uuid v1.1.1
 	github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968

go.sum

@@ -143,8 +143,8 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=

internal/tfplugin5/tfplugin5.pb.go

@@ -4,10 +4,12 @@
 package tfplugin5
 
 import (
+	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -20,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Diagnostic_Severity int32
 
@@ -324,86 +326,15 @@ func (m *AttributePath_Step) GetElementKeyInt() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
+// XXX_OneofWrappers is for the internal use of the proto package.
-func (*AttributePath_Step) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+func (*AttributePath_Step) XXX_OneofWrappers() []interface{} {
-	return _AttributePath_Step_OneofMarshaler, _AttributePath_Step_OneofUnmarshaler, _AttributePath_Step_OneofSizer, []interface{}{
+	return []interface{}{
 		(*AttributePath_Step_AttributeName)(nil),
 		(*AttributePath_Step_ElementKeyString)(nil),
 		(*AttributePath_Step_ElementKeyInt)(nil),
 	}
 }
 
-func _AttributePath_Step_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AttributePath_Step)
-	// selector
-	switch x := m.Selector.(type) {
-	case *AttributePath_Step_AttributeName:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AttributeName)
-	case *AttributePath_Step_ElementKeyString:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ElementKeyString)
-	case *AttributePath_Step_ElementKeyInt:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ElementKeyInt))
-	case nil:
-	default:
-		return fmt.Errorf("AttributePath_Step.Selector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AttributePath_Step_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AttributePath_Step)
-	switch tag {
-	case 1: // selector.attribute_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Selector = &AttributePath_Step_AttributeName{x}
-		return true, err
-	case 2: // selector.element_key_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Selector = &AttributePath_Step_ElementKeyString{x}
-		return true, err
-	case 3: // selector.element_key_int
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Selector = &AttributePath_Step_ElementKeyInt{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AttributePath_Step_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AttributePath_Step)
-	// selector
-	switch x := m.Selector.(type) {
-	case *AttributePath_Step_AttributeName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AttributeName)))
-		n += len(x.AttributeName)
-	case *AttributePath_Step_ElementKeyString:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ElementKeyString)))
-		n += len(x.ElementKeyString)
-	case *AttributePath_Step_ElementKeyInt:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ElementKeyInt))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type Stop struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -2906,21 +2837,21 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ProviderClient interface {
-	// ////// Information about what a provider supports/expects
+	//////// Information about what a provider supports/expects
 	GetSchema(ctx context.Context, in *GetProviderSchema_Request, opts ...grpc.CallOption) (*GetProviderSchema_Response, error)
 	PrepareProviderConfig(ctx context.Context, in *PrepareProviderConfig_Request, opts ...grpc.CallOption) (*PrepareProviderConfig_Response, error)
 	ValidateResourceTypeConfig(ctx context.Context, in *ValidateResourceTypeConfig_Request, opts ...grpc.CallOption) (*ValidateResourceTypeConfig_Response, error)
 	ValidateDataSourceConfig(ctx context.Context, in *ValidateDataSourceConfig_Request, opts ...grpc.CallOption) (*ValidateDataSourceConfig_Response, error)
 	UpgradeResourceState(ctx context.Context, in *UpgradeResourceState_Request, opts ...grpc.CallOption) (*UpgradeResourceState_Response, error)
-	// ////// One-time initialization, called before other functions below
+	//////// One-time initialization, called before other functions below
 	Configure(ctx context.Context, in *Configure_Request, opts ...grpc.CallOption) (*Configure_Response, error)
-	// ////// Managed Resource Lifecycle
+	//////// Managed Resource Lifecycle
 	ReadResource(ctx context.Context, in *ReadResource_Request, opts ...grpc.CallOption) (*ReadResource_Response, error)
 	PlanResourceChange(ctx context.Context, in *PlanResourceChange_Request, opts ...grpc.CallOption) (*PlanResourceChange_Response, error)
 	ApplyResourceChange(ctx context.Context, in *ApplyResourceChange_Request, opts ...grpc.CallOption) (*ApplyResourceChange_Response, error)
 	ImportResourceState(ctx context.Context, in *ImportResourceState_Request, opts ...grpc.CallOption) (*ImportResourceState_Response, error)
 	ReadDataSource(ctx context.Context, in *ReadDataSource_Request, opts ...grpc.CallOption) (*ReadDataSource_Response, error)
-	// ////// Graceful Shutdown
+	//////// Graceful Shutdown
 	Stop(ctx context.Context, in *Stop_Request, opts ...grpc.CallOption) (*Stop_Response, error)
 }
 
@@ -3042,24 +2973,65 @@ func (c *providerClient) Stop(ctx context.Context, in *Stop_Request, opts ...grp
 
 // ProviderServer is the server API for Provider service.
 type ProviderServer interface {
-	// ////// Information about what a provider supports/expects
+	//////// Information about what a provider supports/expects
 	GetSchema(context.Context, *GetProviderSchema_Request) (*GetProviderSchema_Response, error)
 	PrepareProviderConfig(context.Context, *PrepareProviderConfig_Request) (*PrepareProviderConfig_Response, error)
 	ValidateResourceTypeConfig(context.Context, *ValidateResourceTypeConfig_Request) (*ValidateResourceTypeConfig_Response, error)
 	ValidateDataSourceConfig(context.Context, *ValidateDataSourceConfig_Request) (*ValidateDataSourceConfig_Response, error)
 	UpgradeResourceState(context.Context, *UpgradeResourceState_Request) (*UpgradeResourceState_Response, error)
-	// ////// One-time initialization, called before other functions below
+	//////// One-time initialization, called before other functions below
 	Configure(context.Context, *Configure_Request) (*Configure_Response, error)
-	// ////// Managed Resource Lifecycle
+	//////// Managed Resource Lifecycle
 	ReadResource(context.Context, *ReadResource_Request) (*ReadResource_Response, error)
 	PlanResourceChange(context.Context, *PlanResourceChange_Request) (*PlanResourceChange_Response, error)
 	ApplyResourceChange(context.Context, *ApplyResourceChange_Request) (*ApplyResourceChange_Response, error)
 	ImportResourceState(context.Context, *ImportResourceState_Request) (*ImportResourceState_Response, error)
 	ReadDataSource(context.Context, *ReadDataSource_Request) (*ReadDataSource_Response, error)
-	// ////// Graceful Shutdown
+	//////// Graceful Shutdown
 	Stop(context.Context, *Stop_Request) (*Stop_Response, error)
 }
 
+// UnimplementedProviderServer can be embedded to have forward compatible implementations.
+type UnimplementedProviderServer struct {
+}
+
+func (*UnimplementedProviderServer) GetSchema(ctx context.Context, req *GetProviderSchema_Request) (*GetProviderSchema_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetSchema not implemented")
+}
+func (*UnimplementedProviderServer) PrepareProviderConfig(ctx context.Context, req *PrepareProviderConfig_Request) (*PrepareProviderConfig_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PrepareProviderConfig not implemented")
+}
+func (*UnimplementedProviderServer) ValidateResourceTypeConfig(ctx context.Context, req *ValidateResourceTypeConfig_Request) (*ValidateResourceTypeConfig_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ValidateResourceTypeConfig not implemented")
+}
+func (*UnimplementedProviderServer) ValidateDataSourceConfig(ctx context.Context, req *ValidateDataSourceConfig_Request) (*ValidateDataSourceConfig_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ValidateDataSourceConfig not implemented")
+}
+func (*UnimplementedProviderServer) UpgradeResourceState(ctx context.Context, req *UpgradeResourceState_Request) (*UpgradeResourceState_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpgradeResourceState not implemented")
+}
+func (*UnimplementedProviderServer) Configure(ctx context.Context, req *Configure_Request) (*Configure_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Configure not implemented")
+}
+func (*UnimplementedProviderServer) ReadResource(ctx context.Context, req *ReadResource_Request) (*ReadResource_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ReadResource not implemented")
+}
+func (*UnimplementedProviderServer) PlanResourceChange(ctx context.Context, req *PlanResourceChange_Request) (*PlanResourceChange_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PlanResourceChange not implemented")
+}
+func (*UnimplementedProviderServer) ApplyResourceChange(ctx context.Context, req *ApplyResourceChange_Request) (*ApplyResourceChange_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ApplyResourceChange not implemented")
+}
+func (*UnimplementedProviderServer) ImportResourceState(ctx context.Context, req *ImportResourceState_Request) (*ImportResourceState_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ImportResourceState not implemented")
+}
+func (*UnimplementedProviderServer) ReadDataSource(ctx context.Context, req *ReadDataSource_Request) (*ReadDataSource_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ReadDataSource not implemented")
+}
+func (*UnimplementedProviderServer) Stop(ctx context.Context, req *Stop_Request) (*Stop_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Stop not implemented")
+}
+
 func RegisterProviderServer(s *grpc.Server, srv ProviderServer) {
 	s.RegisterService(&_Provider_serviceDesc, srv)
 }
@@ -3422,6 +3394,23 @@ type ProvisionerServer interface {
 	Stop(context.Context, *Stop_Request) (*Stop_Response, error)
 }
 
+// UnimplementedProvisionerServer can be embedded to have forward compatible implementations.
+type UnimplementedProvisionerServer struct {
+}
+
+func (*UnimplementedProvisionerServer) GetSchema(ctx context.Context, req *GetProvisionerSchema_Request) (*GetProvisionerSchema_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetSchema not implemented")
+}
+func (*UnimplementedProvisionerServer) ValidateProvisionerConfig(ctx context.Context, req *ValidateProvisionerConfig_Request) (*ValidateProvisionerConfig_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ValidateProvisionerConfig not implemented")
+}
+func (*UnimplementedProvisionerServer) ProvisionResource(req *ProvisionResource_Request, srv Provisioner_ProvisionResourceServer) error {
+	return status.Errorf(codes.Unimplemented, "method ProvisionResource not implemented")
+}
+func (*UnimplementedProvisionerServer) Stop(ctx context.Context, req *Stop_Request) (*Stop_Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Stop not implemented")
+}
+
 func RegisterProvisionerServer(s *grpc.Server, srv ProvisionerServer) {
 	s.RegisterService(&_Provisioner_serviceDesc, srv)
 }

plans/internal/planproto/planfile.pb.go

@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: planfile.proto
 
-package planproto // import "github.com/hashicorp/terraform/plans/internal/planproto"
+package planproto
 
-import proto "github.com/golang/protobuf/proto"
+import (
-import fmt "fmt"
+	fmt "fmt"
-import math "math"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Action describes the type of action planned for an object.
 // Not all action values are valid for all object types.
@@ -41,6 +43,7 @@ var Action_name = map[int32]string{
 	6: "DELETE_THEN_CREATE",
 	7: "CREATE_THEN_DELETE",
 }
+
 var Action_value = map[string]int32{
 	"NOOP":               0,
 	"CREATE":             1,
@@ -54,8 +57,9 @@ var Action_value = map[string]int32{
 func (x Action) String() string {
 	return proto.EnumName(Action_name, int32(x))
 }
+
 func (Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{0}
+	return fileDescriptor_02431083a6706c5b, []int{0}
 }
 
 type ResourceInstanceChange_ResourceMode int32
@@ -69,6 +73,7 @@ var ResourceInstanceChange_ResourceMode_name = map[int32]string{
 	0: "managed",
 	1: "data",
 }
+
 var ResourceInstanceChange_ResourceMode_value = map[string]int32{
 	"managed": 0,
 	"data":    1,
@@ -77,8 +82,9 @@ var ResourceInstanceChange_ResourceMode_value = map[string]int32{
 func (x ResourceInstanceChange_ResourceMode) String() string {
 	return proto.EnumName(ResourceInstanceChange_ResourceMode_name, int32(x))
 }
+
 func (ResourceInstanceChange_ResourceMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{3, 0}
+	return fileDescriptor_02431083a6706c5b, []int{3, 0}
 }
 
 // Plan is the root message type for the tfplan file
@@ -125,16 +131,17 @@ func (m *Plan) Reset()         { *m = Plan{} }
 func (m *Plan) String() string { return proto.CompactTextString(m) }
 func (*Plan) ProtoMessage()    {}
 func (*Plan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{0}
+	return fileDescriptor_02431083a6706c5b, []int{0}
 }
+
 func (m *Plan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Plan.Unmarshal(m, b)
 }
 func (m *Plan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Plan.Marshal(b, m, deterministic)
 }
-func (dst *Plan) XXX_Merge(src proto.Message) {
+func (m *Plan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Plan.Merge(dst, src)
+	xxx_messageInfo_Plan.Merge(m, src)
 }
 func (m *Plan) XXX_Size() int {
 	return xxx_messageInfo_Plan.Size(m)
@@ -215,16 +222,17 @@ func (m *Backend) Reset()         { *m = Backend{} }
 func (m *Backend) String() string { return proto.CompactTextString(m) }
 func (*Backend) ProtoMessage()    {}
 func (*Backend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{1}
+	return fileDescriptor_02431083a6706c5b, []int{1}
 }
+
 func (m *Backend) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Backend.Unmarshal(m, b)
 }
 func (m *Backend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Backend.Marshal(b, m, deterministic)
 }
-func (dst *Backend) XXX_Merge(src proto.Message) {
+func (m *Backend) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Backend.Merge(dst, src)
+	xxx_messageInfo_Backend.Merge(m, src)
 }
 func (m *Backend) XXX_Size() int {
 	return xxx_messageInfo_Backend.Size(m)
@@ -281,16 +289,17 @@ func (m *Change) Reset()         { *m = Change{} }
 func (m *Change) String() string { return proto.CompactTextString(m) }
 func (*Change) ProtoMessage()    {}
 func (*Change) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{2}
+	return fileDescriptor_02431083a6706c5b, []int{2}
 }
+
 func (m *Change) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Change.Unmarshal(m, b)
 }
 func (m *Change) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Change.Marshal(b, m, deterministic)
 }
-func (dst *Change) XXX_Merge(src proto.Message) {
+func (m *Change) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Change.Merge(dst, src)
+	xxx_messageInfo_Change.Merge(m, src)
 }
 func (m *Change) XXX_Size() int {
 	return xxx_messageInfo_Change.Size(m)
@@ -367,16 +376,17 @@ func (m *ResourceInstanceChange) Reset()         { *m = ResourceInstanceChange{}
 func (m *ResourceInstanceChange) String() string { return proto.CompactTextString(m) }
 func (*ResourceInstanceChange) ProtoMessage()    {}
 func (*ResourceInstanceChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{3}
+	return fileDescriptor_02431083a6706c5b, []int{3}
 }
+
 func (m *ResourceInstanceChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceInstanceChange.Unmarshal(m, b)
 }
 func (m *ResourceInstanceChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceInstanceChange.Marshal(b, m, deterministic)
 }
-func (dst *ResourceInstanceChange) XXX_Merge(src proto.Message) {
+func (m *ResourceInstanceChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceInstanceChange.Merge(dst, src)
+	xxx_messageInfo_ResourceInstanceChange.Merge(m, src)
 }
 func (m *ResourceInstanceChange) XXX_Size() int {
 	return xxx_messageInfo_ResourceInstanceChange.Size(m)
@@ -387,27 +397,6 @@ func (m *ResourceInstanceChange) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ResourceInstanceChange proto.InternalMessageInfo
 
-type isResourceInstanceChange_InstanceKey interface {
-	isResourceInstanceChange_InstanceKey()
-}
-
-type ResourceInstanceChange_Str struct {
-	Str string `protobuf:"bytes,5,opt,name=str,proto3,oneof"`
-}
-type ResourceInstanceChange_Int struct {
-	Int int64 `protobuf:"varint,6,opt,name=int,proto3,oneof"`
-}
-
-func (*ResourceInstanceChange_Str) isResourceInstanceChange_InstanceKey() {}
-func (*ResourceInstanceChange_Int) isResourceInstanceChange_InstanceKey() {}
-
-func (m *ResourceInstanceChange) GetInstanceKey() isResourceInstanceChange_InstanceKey {
-	if m != nil {
-		return m.InstanceKey
-	}
-	return nil
-}
-
 func (m *ResourceInstanceChange) GetModulePath() string {
 	if m != nil {
 		return m.ModulePath
@@ -436,6 +425,29 @@ func (m *ResourceInstanceChange) GetName() string {
 	return ""
 }
 
+type isResourceInstanceChange_InstanceKey interface {
+	isResourceInstanceChange_InstanceKey()
+}
+
+type ResourceInstanceChange_Str struct {
+	Str string `protobuf:"bytes,5,opt,name=str,proto3,oneof"`
+}
+
+type ResourceInstanceChange_Int struct {
+	Int int64 `protobuf:"varint,6,opt,name=int,proto3,oneof"`
+}
+
+func (*ResourceInstanceChange_Str) isResourceInstanceChange_InstanceKey() {}
+
+func (*ResourceInstanceChange_Int) isResourceInstanceChange_InstanceKey() {}
+
+func (m *ResourceInstanceChange) GetInstanceKey() isResourceInstanceChange_InstanceKey {
+	if m != nil {
+		return m.InstanceKey
+	}
+	return nil
+}
+
 func (m *ResourceInstanceChange) GetStr() string {
 	if x, ok := m.GetInstanceKey().(*ResourceInstanceChange_Str); ok {
 		return x.Str
@@ -485,71 +497,14 @@ func (m *ResourceInstanceChange) GetRequiredReplace() []*Path {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
+// XXX_OneofWrappers is for the internal use of the proto package.
-func (*ResourceInstanceChange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+func (*ResourceInstanceChange) XXX_OneofWrappers() []interface{} {
-	return _ResourceInstanceChange_OneofMarshaler, _ResourceInstanceChange_OneofUnmarshaler, _ResourceInstanceChange_OneofSizer, []interface{}{
+	return []interface{}{
 		(*ResourceInstanceChange_Str)(nil),
 		(*ResourceInstanceChange_Int)(nil),
 	}
 }
 
-func _ResourceInstanceChange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ResourceInstanceChange)
-	// instance_key
-	switch x := m.InstanceKey.(type) {
-	case *ResourceInstanceChange_Str:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Str)
-	case *ResourceInstanceChange_Int:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int))
-	case nil:
-	default:
-		return fmt.Errorf("ResourceInstanceChange.InstanceKey has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ResourceInstanceChange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ResourceInstanceChange)
-	switch tag {
-	case 5: // instance_key.str
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.InstanceKey = &ResourceInstanceChange_Str{x}
-		return true, err
-	case 6: // instance_key.int
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.InstanceKey = &ResourceInstanceChange_Int{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ResourceInstanceChange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ResourceInstanceChange)
-	// instance_key
-	switch x := m.InstanceKey.(type) {
-	case *ResourceInstanceChange_Str:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Str)))
-		n += len(x.Str)
-	case *ResourceInstanceChange_Int:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type OutputChange struct {
 	// Name of the output as defined in the root module.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -569,16 +524,17 @@ func (m *OutputChange) Reset()         { *m = OutputChange{} }
 func (m *OutputChange) String() string { return proto.CompactTextString(m) }
 func (*OutputChange) ProtoMessage()    {}
 func (*OutputChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{4}
+	return fileDescriptor_02431083a6706c5b, []int{4}
 }
+
 func (m *OutputChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputChange.Unmarshal(m, b)
 }
 func (m *OutputChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputChange.Marshal(b, m, deterministic)
 }
-func (dst *OutputChange) XXX_Merge(src proto.Message) {
+func (m *OutputChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputChange.Merge(dst, src)
+	xxx_messageInfo_OutputChange.Merge(m, src)
 }
 func (m *OutputChange) XXX_Size() int {
 	return xxx_messageInfo_OutputChange.Size(m)
@@ -633,16 +589,17 @@ func (m *DynamicValue) Reset()         { *m = DynamicValue{} }
 func (m *DynamicValue) String() string { return proto.CompactTextString(m) }
 func (*DynamicValue) ProtoMessage()    {}
 func (*DynamicValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{5}
+	return fileDescriptor_02431083a6706c5b, []int{5}
 }
+
 func (m *DynamicValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DynamicValue.Unmarshal(m, b)
 }
 func (m *DynamicValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DynamicValue.Marshal(b, m, deterministic)
 }
-func (dst *DynamicValue) XXX_Merge(src proto.Message) {
+func (m *DynamicValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DynamicValue.Merge(dst, src)
+	xxx_messageInfo_DynamicValue.Merge(m, src)
 }
 func (m *DynamicValue) XXX_Size() int {
 	return xxx_messageInfo_DynamicValue.Size(m)
@@ -679,16 +636,17 @@ func (m *Hash) Reset()         { *m = Hash{} }
 func (m *Hash) String() string { return proto.CompactTextString(m) }
 func (*Hash) ProtoMessage()    {}
 func (*Hash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{6}
+	return fileDescriptor_02431083a6706c5b, []int{6}
 }
+
 func (m *Hash) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Hash.Unmarshal(m, b)
 }
 func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
 }
-func (dst *Hash) XXX_Merge(src proto.Message) {
+func (m *Hash) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Hash.Merge(dst, src)
+	xxx_messageInfo_Hash.Merge(m, src)
 }
 func (m *Hash) XXX_Size() int {
 	return xxx_messageInfo_Hash.Size(m)
@@ -720,16 +678,17 @@ func (m *Path) Reset()         { *m = Path{} }
 func (m *Path) String() string { return proto.CompactTextString(m) }
 func (*Path) ProtoMessage()    {}
 func (*Path) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{7}
+	return fileDescriptor_02431083a6706c5b, []int{7}
 }
+
 func (m *Path) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Path.Unmarshal(m, b)
 }
 func (m *Path) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Path.Marshal(b, m, deterministic)
 }
-func (dst *Path) XXX_Merge(src proto.Message) {
+func (m *Path) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Path.Merge(dst, src)
+	xxx_messageInfo_Path.Merge(m, src)
 }
 func (m *Path) XXX_Size() int {
 	return xxx_messageInfo_Path.Size(m)
@@ -761,16 +720,17 @@ func (m *Path_Step) Reset()         { *m = Path_Step{} }
 func (m *Path_Step) String() string { return proto.CompactTextString(m) }
 func (*Path_Step) ProtoMessage()    {}
 func (*Path_Step) Descriptor() ([]byte, []int) {
-	return fileDescriptor_planfile_f1de017ed03cb7aa, []int{7, 0}
+	return fileDescriptor_02431083a6706c5b, []int{7, 0}
 }
+
 func (m *Path_Step) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Path_Step.Unmarshal(m, b)
 }
 func (m *Path_Step) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Path_Step.Marshal(b, m, deterministic)
 }
-func (dst *Path_Step) XXX_Merge(src proto.Message) {
+func (m *Path_Step) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Path_Step.Merge(dst, src)
+	xxx_messageInfo_Path_Step.Merge(m, src)
 }
 func (m *Path_Step) XXX_Size() int {
 	return xxx_messageInfo_Path_Step.Size(m)
@@ -788,12 +748,14 @@ type isPath_Step_Selector interface {
 type Path_Step_AttributeName struct {
 	AttributeName string `protobuf:"bytes,1,opt,name=attribute_name,json=attributeName,proto3,oneof"`
 }
+
 type Path_Step_ElementKey struct {
 	ElementKey *DynamicValue `protobuf:"bytes,2,opt,name=element_key,json=elementKey,proto3,oneof"`
 }
 
 func (*Path_Step_AttributeName) isPath_Step_Selector() {}
-func (*Path_Step_ElementKey) isPath_Step_Selector()    {}
+
+func (*Path_Step_ElementKey) isPath_Step_Selector() {}
 
 func (m *Path_Step) GetSelector() isPath_Step_Selector {
 	if m != nil {
@@ -816,77 +778,17 @@ func (m *Path_Step) GetElementKey() *DynamicValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
+// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Path_Step) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+func (*Path_Step) XXX_OneofWrappers() []interface{} {
-	return _Path_Step_OneofMarshaler, _Path_Step_OneofUnmarshaler, _Path_Step_OneofSizer, []interface{}{
+	return []interface{}{
 		(*Path_Step_AttributeName)(nil),
 		(*Path_Step_ElementKey)(nil),
 	}
 }
 
-func _Path_Step_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Path_Step)
-	// selector
-	switch x := m.Selector.(type) {
-	case *Path_Step_AttributeName:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AttributeName)
-	case *Path_Step_ElementKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ElementKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Path_Step.Selector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Path_Step_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Path_Step)
-	switch tag {
-	case 1: // selector.attribute_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Selector = &Path_Step_AttributeName{x}
-		return true, err
-	case 2: // selector.element_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DynamicValue)
-		err := b.DecodeMessage(msg)
-		m.Selector = &Path_Step_ElementKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Path_Step_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Path_Step)
-	// selector
-	switch x := m.Selector.(type) {
-	case *Path_Step_AttributeName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AttributeName)))
-		n += len(x.AttributeName)
-	case *Path_Step_ElementKey:
-		s := proto.Size(x.ElementKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("tfplan.Action", Action_name, Action_value)
+	proto.RegisterEnum("tfplan.ResourceInstanceChange_ResourceMode", ResourceInstanceChange_ResourceMode_name, ResourceInstanceChange_ResourceMode_value)
 	proto.RegisterType((*Plan)(nil), "tfplan.Plan")
 	proto.RegisterMapType((map[string]*Hash)(nil), "tfplan.Plan.ProviderHashesEntry")
 	proto.RegisterMapType((map[string]*DynamicValue)(nil), "tfplan.Plan.VariablesEntry")
@@ -898,13 +800,11 @@ func init() {
 	proto.RegisterType((*Hash)(nil), "tfplan.Hash")
 	proto.RegisterType((*Path)(nil), "tfplan.Path")
 	proto.RegisterType((*Path_Step)(nil), "tfplan.Path.Step")
-	proto.RegisterEnum("tfplan.Action", Action_name, Action_value)
-	proto.RegisterEnum("tfplan.ResourceInstanceChange_ResourceMode", ResourceInstanceChange_ResourceMode_name, ResourceInstanceChange_ResourceMode_value)
 }
 
-func init() { proto.RegisterFile("planfile.proto", fileDescriptor_planfile_f1de017ed03cb7aa) }
+func init() { proto.RegisterFile("planfile.proto", fileDescriptor_02431083a6706c5b) }
 
-var fileDescriptor_planfile_f1de017ed03cb7aa = []byte{
+var fileDescriptor_02431083a6706c5b = []byte{
 	// 893 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0xe1, 0x6e, 0xe3, 0x44,
 	0x10, 0xae, 0x63, 0xc7, 0x49, 0x26, 0xa9, 0x9b, 0x5b, 0x50, 0x65, 0x95, 0xd3, 0x11, 0x2c, 0xc1,

vendor/github.com/golang/protobuf/proto/properties.go

@@ -38,7 +38,6 @@ package proto
 import (
 	"fmt"
 	"log"
-	"os"
 	"reflect"
 	"sort"
 	"strconv"
@@ -194,7 +193,7 @@ func (p *Properties) Parse(s string) {
 	// "bytes,49,opt,name=foo,def=hello!"
 	fields := strings.Split(s, ",") // breaks def=, but handled below.
 	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+		log.Printf("proto: tag has too few fields: %q", s)
 		return
 	}
 
@@ -214,7 +213,7 @@ func (p *Properties) Parse(s string) {
 		p.WireType = WireBytes
 		// no numeric converter for non-numeric types
 	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+		log.Printf("proto: tag has unknown wire type: %q", s)
 		return
 	}
 

vendor/modules.txt

@@ -168,7 +168,7 @@ github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/protoc-gen-gogo/descriptor
 # github.com/golang/mock v1.3.1
 github.com/golang/mock/gomock
-# github.com/golang/protobuf v1.3.1
+# github.com/golang/protobuf v1.3.2
 github.com/golang/protobuf/proto
 github.com/golang/protobuf/ptypes
 github.com/golang/protobuf/ptypes/any
@@ -593,14 +593,14 @@ google.golang.org/genproto/googleapis/api/annotations
 # google.golang.org/grpc v1.19.1
 google.golang.org/grpc
 google.golang.org/grpc/test/bufconn
+google.golang.org/grpc/codes
+google.golang.org/grpc/status
 google.golang.org/grpc/metadata
 google.golang.org/grpc/credentials
 google.golang.org/grpc/health
 google.golang.org/grpc/health/grpc_health_v1
-google.golang.org/grpc/codes
 google.golang.org/grpc/grpclog
 google.golang.org/grpc/keepalive
-google.golang.org/grpc/status
 google.golang.org/grpc/balancer
 google.golang.org/grpc/balancer/roundrobin
 google.golang.org/grpc/connectivity