Merge 'publish/v0.0.60' into 'main'

publish v0.0.60

See merge request: !88

Author: volc-sdk-team

docs/data-sources/ecs_instance.md

@@ -43,6 +43,7 @@ Data Source schema for Volcengine::ECS::Instance
     - Currently, only g3al, c3al, r3al, g4i, c4i, r4i, g4ie, c4ie, r4ie instances support this parameter. For base/turbo frequencies and more information, see [Instance Specifications Introduction](https://www.volcengine.com/docs/6396/70840).
     - This feature is in invitation-only testing. To use it, please contact your account manager.
 - `cpu_memory` (Attributes) The CPU options for the instance. (see [below for nested schema](#nestedatt--cpu_memory))
+- `cpu_options` (Attributes) CPU configuration options for the instance (see [below for nested schema](#nestedatt--cpu_options))
 - `created_at` (String) Instance creation time.
 - `credit_specification` (String) Burstable instance operating mode. Values:
     - Standard: Standard mode.
@@ -167,6 +168,19 @@ Read-Only:
 - `threads_per_core` (Number) Threads per core for the instance.
 
 
+<a id="nestedatt--cpu_options"></a>
+### Nested Schema for `cpu_options`
+
+Read-Only:
+
+- `topology_type` (String) CPU topology mode. Available values:
+    - ContinuousCoreToHTMapping: Continuous HT mode
+    - DiscreteCoreToHTMapping (default): Discrete HT mode
+  
+  **Note:**
+  This feature is currently in invitation-only testing. To use it, please contact your account manager to apply.
+
+
 <a id="nestedatt--data_volumes"></a>
 ### Nested Schema for `data_volumes`
 

docs/resources/ecs_instance.md

@@ -57,6 +57,9 @@ resource "volcenginecc_ecs_instance" "EcsInstanceDemo" {
     delete_with_instance = true
     volume_type          = "ESSD_FlexPL"
   }
+  cpu_options = {
+    topology_type = "DiscreteCoreToHTMapping"
+  }
 }
 ```
 
@@ -99,6 +102,7 @@ resource "volcenginecc_ecs_instance" "EcsInstanceDemo" {
   **Note:**
     - Currently, only g3al, c3al, r3al, g4i, c4i, r4i, g4ie, c4ie, r4ie instances support this parameter. For base/turbo frequencies and more information, see [Instance Specifications Introduction](https://www.volcengine.com/docs/6396/70840).
     - This feature is in invitation-only testing. To use it, please contact your account manager.
+- `cpu_options` (Attributes) CPU configuration options for the instance (see [below for nested schema](#nestedatt--cpu_options))
 - `credit_specification` (String) Burstable instance operating mode. Values:
     - Standard: Standard mode.
     - Unlimited: Unlimited performance mode (not supported yet).
@@ -270,6 +274,19 @@ Read-Only:
 - `volume_id` (String) Instance volume ID.
 
 
+<a id="nestedatt--cpu_options"></a>
+### Nested Schema for `cpu_options`
+
+Optional:
+
+- `topology_type` (String) CPU topology mode. Available values:
+    - ContinuousCoreToHTMapping: Continuous HT mode
+    - DiscreteCoreToHTMapping (default): Discrete HT mode
+  
+  **Note:**
+  This feature is currently in invitation-only testing. To use it, please contact your account manager to apply.
+
+
 <a id="nestedatt--data_volumes"></a>
 ### Nested Schema for `data_volumes`
 

examples/resources/volcenginecc_ecs_instance/ecs_instance.tf

@@ -43,4 +43,7 @@ resource "volcenginecc_ecs_instance" "EcsInstanceDemo" {
     delete_with_instance = true
     volume_type          = "ESSD_FlexPL"
   }
+  cpu_options = {
+    topology_type = "DiscreteCoreToHTMapping"
+  }
 }

internal/common/common.go

@@ -2,5 +2,5 @@ package common
 
 const (
 	TerraformProviderName    = "terraform-provider-volcenginecc"
-	TerraformProviderVersion = "0.0.59"
+	TerraformProviderVersion = "0.0.60"
 )

internal/generic/resource.go

@@ -548,7 +548,7 @@ func (r *genericResource) Read(ctx context.Context, request resource.ReadRequest
 
 	if tfresource.NotFound(err) {
 		response.Diagnostics.Append(ResourceNotFoundWarningDiag(err))
-		//response.State.RemoveResource(ctx)
+		response.State.RemoveResource(ctx)
 
 		return
 	}
@@ -879,6 +879,11 @@ func (r *genericResource) Delete(ctx context.Context, request resource.DeleteReq
 
 	err = tfcloudcontrol.DeleteResource(ctx, conn, r.provider.Region(ctx), "", r.ccTypeName, id)
 
+	if tfresource.NotFound(err) {
+		response.State.RemoveResource(ctx)
+		return
+	}
+
 	if err != nil {
 		response.Diagnostics.Append(ServiceOperationErrorDiag("Cloud Control API", "DeleteResource", err))
 

internal/service/cloudcontrol/delete.go

@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/volcengine/terraform-provider-volcenginecc/internal/base"
 	"github.com/volcengine/terraform-provider-volcenginecc/internal/cloudcontrol"
+	"github.com/volcengine/terraform-provider-volcenginecc/internal/tfresource"
 	"github.com/volcengine/terraform-provider-volcenginecc/internal/util"
 )
 
@@ -28,7 +29,7 @@ func DeleteResource(ctx context.Context, cloudControlClient *cloudcontrol.CloudC
 		ClientToken: util.StringPtr(util.GenerateToken(32)),
 	})
 	if err != nil {
-		return err
+		return wrapCloudControlNotFound(err)
 	}
 	if resp == nil || resp.OperationStatus == nil {
 		return fmt.Errorf("call DeleteResource failed,resp:%s,err:%v ", util.JsonString(resp), err)
@@ -37,7 +38,11 @@ func DeleteResource(ctx context.Context, cloudControlClient *cloudcontrol.CloudC
 	taskId := ""
 	status := *resp.OperationStatus
 	if status == base.FAILED {
-		return fmt.Errorf("invoke DeleteResource handler failed,resp:%s ", util.JsonString(resp))
+		err := fmt.Errorf("invoke DeleteResource handler failed,resp:%s ", util.JsonString(resp))
+		if isCloudControlNotFoundProgressEvent(&resp.ProgressEvent) {
+			return &tfresource.NotFoundError{LastError: err}
+		}
+		return err
 	} else if status == base.SUCCESS {
 		return nil
 	} else if status == base.IN_PROGRESS || status == base.PENDING {
@@ -88,7 +93,11 @@ func AwaitTask(ctx context.Context, client *cloudcontrol.CloudControl, taskId st
 
 		status := *output.OperationStatus
 		if status == base.FAILED {
-			return nil, false, fmt.Errorf("invoke get task failed,resp:%s,err:%v ", util.JsonString(output), err)
+			err := fmt.Errorf("invoke get task failed,resp:%s ", util.JsonString(output))
+			if isCloudControlNotFoundProgressEvent(output) {
+				return nil, false, &tfresource.NotFoundError{LastError: err}
+			}
+			return nil, false, err
 		} else if status == base.SUCCESS {
 			return output, true, nil
 		} else if status == base.IN_PROGRESS || status == base.PENDING {

internal/service/cloudcontrol/error.go

@@ -0,0 +1,66 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package cloudcontrol
+
+import (
+	"errors"
+	"net/http"
+	"strings"
+
+	"github.com/volcengine/terraform-provider-volcenginecc/internal/cloudcontrol"
+	"github.com/volcengine/terraform-provider-volcenginecc/internal/tfresource"
+	"github.com/volcengine/volcengine-go-sdk/volcengine/volcengineerr"
+)
+
+const cloudControlNotFoundHandlerErrorCode = "(HandlerErrorCode: NotFound)"
+
+// wrapCloudControlNotFound converts errors that explicitly identify a missing
+// Cloud Control resource into the provider's shared NotFoundError type.
+func wrapCloudControlNotFound(err error) error {
+	if err == nil || tfresource.NotFound(err) {
+		return err
+	}
+
+	if isCloudControlNotFoundError(err) {
+		return &tfresource.NotFoundError{LastError: err}
+	}
+
+	return err
+}
+
+// isCloudControlNotFoundError checks structured SDK error data first and uses
+// the exact Cloud Control handler marker only as a compatibility fallback.
+func isCloudControlNotFoundError(err error) bool {
+	var requestFailure volcengineerr.RequestFailure
+	if errors.As(err, &requestFailure) && requestFailure.StatusCode() == http.StatusNotFound {
+		return true
+	}
+
+	var sdkError volcengineerr.Error
+	if errors.As(err, &sdkError) && isCloudControlNotFoundCode(sdkError.Code()) {
+		return true
+	}
+
+	return strings.Contains(err.Error(), cloudControlNotFoundHandlerErrorCode)
+}
+
+// isCloudControlNotFoundProgressEvent reports whether a failed asynchronous
+// operation explicitly returned a resource-not-found handler error.
+func isCloudControlNotFoundProgressEvent(event *cloudcontrol.ProgressEvent) bool {
+	if event == nil {
+		return false
+	}
+
+	if event.ErrorCode != nil && isCloudControlNotFoundCode(*event.ErrorCode) {
+		return true
+	}
+
+	return event.StatusMessage != nil && strings.Contains(*event.StatusMessage, cloudControlNotFoundHandlerErrorCode)
+}
+
+// isCloudControlNotFoundCode accepts the generic Cloud Control NotFound code
+// and service-specific codes whose final, complete segment is NotFound.
+func isCloudControlNotFoundCode(code string) bool {
+	return code == "NotFound" || strings.HasSuffix(code, ".NotFound")
+}

internal/service/cloudcontrol/error_test.go

@@ -0,0 +1,113 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package cloudcontrol
+
+import (
+	"errors"
+	"net/http"
+	"testing"
+
+	ccsdk "github.com/volcengine/terraform-provider-volcenginecc/internal/cloudcontrol"
+	"github.com/volcengine/terraform-provider-volcenginecc/internal/tfresource"
+	"github.com/volcengine/volcengine-go-sdk/volcengine/volcengineerr"
+)
+
+// TestWrapCloudControlNotFound verifies that only explicit Cloud Control
+// resource-not-found responses are converted to tfresource.NotFoundError.
+func TestWrapCloudControlNotFound(t *testing.T) {
+	t.Parallel()
+
+	tests := map[string]struct {
+		err      error
+		expected bool
+	}{
+		"exact SDK code": {
+			err:      volcengineerr.New("NotFound", "resource does not exist", nil),
+			expected: true,
+		},
+		"HTTP 404": {
+			err: volcengineerr.NewRequestFailure(
+				volcengineerr.New("UnknownError", "resource does not exist", nil),
+				http.StatusNotFound,
+				"request-id",
+			),
+			expected: true,
+		},
+		"exact handler marker": {
+			err:      errors.New("handler failed (HandlerErrorCode: NotFound)"),
+			expected: true,
+		},
+		"service-specific NotFound code": {
+			err:      volcengineerr.New("InvalidNatGateway.NotFound", "resource does not exist", nil),
+			expected: true,
+		},
+		"partial service code suffix is not enough": {
+			err: volcengineerr.New("InvalidNatGateway.NotFoundExtra", "different service error", nil),
+		},
+		"partial handler marker is not enough": {
+			err: errors.New("handler failed (HandlerErrorCode: NotFoundExtra)"),
+		},
+		"ordinary error": {
+			err: errors.New("permission denied"),
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			err := wrapCloudControlNotFound(test.err)
+			if got := tfresource.NotFound(err); got != test.expected {
+				t.Fatalf("tfresource.NotFound() = %t, want %t; error: %v", got, test.expected, err)
+			}
+		})
+	}
+}
+
+// TestIsCloudControlNotFoundProgressEvent verifies the strict ErrorCode and
+// StatusMessage boundaries used for failed synchronous and asynchronous tasks.
+func TestIsCloudControlNotFoundProgressEvent(t *testing.T) {
+	t.Parallel()
+
+	notFound := "NotFound"
+	serviceCode := "InvalidNatGateway.NotFound"
+	partialServiceCode := "InvalidNatGateway.NotFoundExtra"
+	exactMarker := "handler failed (HandlerErrorCode: NotFound)"
+	partialMarker := "handler failed (HandlerErrorCode: NotFoundExtra)"
+
+	tests := map[string]struct {
+		event    *ccsdk.ProgressEvent
+		expected bool
+	}{
+		"nil event": {},
+		"exact error code": {
+			event:    &ccsdk.ProgressEvent{ErrorCode: &notFound},
+			expected: true,
+		},
+		"service-specific NotFound code": {
+			event:    &ccsdk.ProgressEvent{ErrorCode: &serviceCode},
+			expected: true,
+		},
+		"partial service code suffix is not enough": {
+			event: &ccsdk.ProgressEvent{ErrorCode: &partialServiceCode},
+		},
+		"exact status marker": {
+			event:    &ccsdk.ProgressEvent{StatusMessage: &exactMarker},
+			expected: true,
+		},
+		"partial status marker is not enough": {
+			event: &ccsdk.ProgressEvent{StatusMessage: &partialMarker},
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			if got := isCloudControlNotFoundProgressEvent(test.event); got != test.expected {
+				t.Fatalf("isCloudControlNotFoundProgressEvent() = %t, want %t", got, test.expected)
+			}
+		})
+	}
+}

internal/service/cloudcontrol/find.go

@@ -26,11 +26,7 @@ func FindResourceByTypeNameAndIDWithSysTag(ctx context.Context, client *cloudcon
 		Identifier: &id,
 	})
 	if err != nil {
-		if strings.Contains(err.Error(), "HandlerErrorCode: NotFound") {
-			return nil, &tfresource.NotFoundError{LastError: err}
-
-		}
-		return nil, err
+		return nil, wrapCloudControlNotFound(err)
 	}
 	if output == nil || output.ResourceDescription == nil {
 		return nil, &tfresource.NotFoundError{Message: "Empty result"}
@@ -48,18 +44,14 @@ func FindResourceByTypeNameAndID(ctx context.Context, client *cloudcontrol.Cloud
 		Identifier: &id,
 	})
 	if err != nil {
-		if strings.Contains(err.Error(), "HandlerErrorCode: NotFound") {
-			return nil, &tfresource.NotFoundError{LastError: err}
-
-		}
-		return nil, err
+		return nil, wrapCloudControlNotFound(err)
 	}
 	if output == nil || output.ResourceDescription == nil {
 		return nil, &tfresource.NotFoundError{Message: "Empty result"}
 	}
 	err = NormalizeResourceDescription(output.ResourceDescription)
 	if err != nil {
-		return nil, &tfresource.NotFoundError{Message: "normalize resource description err", LastError: err}
+		return nil, fmt.Errorf("normalize resource description: %w", err)
 	}
 	return output, nil
 }

internal/service/cloudcontrol/find_test.go

@@ -2,9 +2,11 @@ package cloudcontrol
 
 import (
 	"encoding/json"
+	"strings"
 	"testing"
 
 	ccsdk "github.com/volcengine/terraform-provider-volcenginecc/internal/cloudcontrol"
+	"github.com/volcengine/terraform-provider-volcenginecc/internal/tfresource"
 	"github.com/volcengine/volcengine-go-sdk/volcengine"
 )
 
@@ -35,3 +37,23 @@ func TestNormalizeResourceDescriptionPreservesTagFields(t *testing.T) {
 		t.Fatalf("Tags[0] = %#v, want Key/Value/Type preserved", tags[0])
 	}
 }
+
+// TestNormalizeResourceDescriptionMalformedPropertiesIsNotNotFound verifies
+// malformed Properties remain a normalization error rather than NotFound.
+func TestNormalizeResourceDescriptionMalformedPropertiesIsNotNotFound(t *testing.T) {
+	t.Parallel()
+
+	properties := "{"
+	description := &ccsdk.ResourceDescriptionForGetResourceOutput{Properties: &properties}
+
+	err := NormalizeResourceDescription(description)
+	if err == nil {
+		t.Fatal("NormalizeResourceDescription() returned nil, want an error")
+	}
+	if tfresource.NotFound(err) {
+		t.Fatalf("NormalizeResourceDescription() error must not be NotFound: %v", err)
+	}
+	if !strings.Contains(err.Error(), "failed to unmarshal ResourceDescription.Properties") {
+		t.Fatalf("NormalizeResourceDescription() error = %q, want unmarshal context", err)
+	}
+}