Skip to content

Commit 808627f

Browse files
rainkwanrainkwan
committed
Renaming just for the resource
1 parent 748c06c commit 808627f

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎internal/fwserver/server_upgraderesourceidentity.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (s *Server) UpgradeResourceIdentity(ctx context.Context, req *UpgradeResour
129129
return
130130
}
131131

132-
UpgradeResourceIdentityRequest := resource.UpgradeResourceIdentityRequest{
132+
UpgradeResourceIdentityRequest := resource.UpgradeIdentityRequest{
133133
RawIdentity: req.RawState,
134134
}
135135

@@ -156,7 +156,7 @@ func (s *Server) UpgradeResourceIdentity(ctx context.Context, req *UpgradeResour
156156

157157
}
158158

159-
UpgradeResourceIdentityResponse := resource.UpgradeResourceIdentityResponse{
159+
UpgradeResourceIdentityResponse := resource.UpgradeIdentityResponse{
160160
Identity: &tfsdk.ResourceIdentity{
161161
Schema: req.IdentitySchema,
162162
// Raw is intentionally not set.

‎internal/fwserver/server_upgraderesourceidentity_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
8888
},
8989
},
9090
},
91-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
91+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
9292
// In practice, the Configure method would save the
9393
// provider data to the Resource implementation and
9494
// use it here. The fact that Configure is able to
@@ -181,7 +181,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
181181
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
182182
return map[int64]resource.IdentityUpgrader{
183183
0: {
184-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
184+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
185185
RawStateValue, err := req.RawIdentity.Unmarshal(tftypes.Object{
186186
AttributeTypes: map[string]tftypes.Type{
187187
"id": tftypes.String,
@@ -253,7 +253,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
253253
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
254254
return map[int64]resource.IdentityUpgrader{
255255
0: {
256-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
256+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
257257
var RawState struct {
258258
Id string `json:"id"`
259259
}
@@ -368,7 +368,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
368368
},
369369
},
370370
},
371-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
371+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
372372
// Expect error before reaching this logic.
373373
},
374374
},
@@ -403,7 +403,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
403403
return map[int64]resource.IdentityUpgrader{
404404
0: {
405405
PriorSchema: &testIdentitySchema,
406-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
406+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
407407
rawStateValue, err := req.RawIdentity.Unmarshal(tftypes.Object{
408408
AttributeTypes: map[string]tftypes.Type{
409409
"id": tftypes.String,
@@ -480,7 +480,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
480480
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
481481
return map[int64]resource.IdentityUpgrader{
482482
0: {
483-
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
483+
IdentityUpgrader: func(ctx context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
484484
// Purposfully not setting resp.ResourceIdentity or resp.UpgradedIdentity
485485
},
486486
},

‎internal/proto5server/server_upgraderesourceidentity_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
8282
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
8383
return map[int64]resource.IdentityUpgrader{
8484
0: {
85-
IdentityUpgrader: func(_ context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
85+
IdentityUpgrader: func(_ context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
8686
expectedSourceIdentity := testNewTfprotov6RawState(t, map[string]interface{}{
8787
"test_id": "test-id-value",
8888
})
@@ -182,7 +182,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
182182
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
183183
return map[int64]resource.IdentityUpgrader{
184184
0: {
185-
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
185+
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
186186
resp.Diagnostics.AddWarning("warning summary", "warning detail")
187187
resp.Diagnostics.AddError("error summary", "error detail")
188188
},
@@ -241,7 +241,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
241241
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
242242
return map[int64]resource.IdentityUpgrader{
243243
0: {
244-
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
244+
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
245245
resp.Identity = &tfsdk.ResourceIdentity{
246246
Raw: tftypes.NewValue(testIdentityType, map[string]tftypes.Value{
247247
"test_id": tftypes.NewValue(tftypes.String, "test-id-value"),

‎internal/proto6server/server_upgraderesourceidentity_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
8282
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
8383
return map[int64]resource.IdentityUpgrader{
8484
0: {
85-
IdentityUpgrader: func(_ context.Context, req resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
85+
IdentityUpgrader: func(_ context.Context, req resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
8686
expectedSourceIdentity := testNewRawState(t, map[string]interface{}{
8787
"test_id": "test-id-value",
8888
})
@@ -182,7 +182,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
182182
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
183183
return map[int64]resource.IdentityUpgrader{
184184
0: {
185-
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
185+
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
186186
resp.Diagnostics.AddWarning("warning summary", "warning detail")
187187
resp.Diagnostics.AddError("error summary", "error detail")
188188
},
@@ -241,7 +241,7 @@ func TestServerUpgradeResourceIdentity(t *testing.T) {
241241
UpgradeResourceIdentityMethod: func(ctx context.Context) map[int64]resource.IdentityUpgrader {
242242
return map[int64]resource.IdentityUpgrader{
243243
0: {
244-
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeResourceIdentityRequest, resp *resource.UpgradeResourceIdentityResponse) {
244+
IdentityUpgrader: func(_ context.Context, _ resource.UpgradeIdentityRequest, resp *resource.UpgradeIdentityResponse) {
245245
resp.Identity = &tfsdk.ResourceIdentity{
246246
Raw: tftypes.NewValue(testIdentityType, map[string]tftypes.Value{
247247
"test_id": tftypes.NewValue(tftypes.String, "test-id-value"),

‎resource/identity_upgrader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ type IdentityUpgrader struct {
3535
//
3636
// The UpgradeResourceIdentityResponse parameter should contain the upgraded
3737
// identity data and can be used to signal any logic warnings or errors.
38-
IdentityUpgrader func(context.Context, UpgradeResourceIdentityRequest, *UpgradeResourceIdentityResponse)
38+
IdentityUpgrader func(context.Context, UpgradeIdentityRequest, *UpgradeIdentityResponse)
3939
}

‎resource/upgrade_identity.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
// Request information for the provider logic to update a resource identity
1313
// from a prior resource identity version to the current identity version.
14-
type UpgradeResourceIdentityRequest struct {
14+
type UpgradeIdentityRequest struct {
1515
// Previous state of the resource identity in JSON format
1616
// (Terraform CLI 0.12 and later) This data is always available,
1717
// regardless of whether the wrapping IdentityUpgrader type
@@ -31,7 +31,7 @@ type UpgradeResourceIdentityRequest struct {
3131

3232
// Response information for the provider logic to update a resource identity
3333
// from a prior resource identity version to the current identity version.
34-
type UpgradeResourceIdentityResponse struct {
34+
type UpgradeIdentityResponse struct {
3535
// Upgraded identity of the resource, which should match the current identity
3636
//schema version.
3737
//

0 commit comments

Comments
 (0)