Fix providerID format

Signed-off-by: ekko <lihai.tu@daocloud.io>
HuaweiCloudDeveloper · Feb 21, 2025 · a404296 · a404296
1 parent 0933be9
commit a404296
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/internal/controller/huaweicloudmachine_controller.go b/internal/controller/huaweicloudmachine_controller.go
@@ -345,7 +345,7 @@ func (r *HuaweiCloudMachineReconciler) reconcileNormal(_ context.Context, machin
 	}
 
 	// Make sure Spec.ProviderID and Spec.InstanceID are always set.
-	machineScope.SetProviderID(instance.ID, instance.AvailabilityZone)
+	machineScope.SetProviderID(instance.ID)
 	machineScope.SetInstanceID(instance.ID)
 
 	existingInstanceState := machineScope.GetInstanceState()

diff --git a/pkg/scope/machine.go b/pkg/scope/machine.go
@@ -122,8 +122,8 @@ func (m *MachineScope) GetProviderID() string {
 }
 
 // SetProviderID sets the HuaweiCloudMachine providerID in spec.
-func (m *MachineScope) SetProviderID(instanceID, availabilityZone string) {
-	providerID := GenerateProviderID(availabilityZone, instanceID)
+func (m *MachineScope) SetProviderID(instanceID string) {
+	providerID := GenerateProviderID(instanceID)
 	m.HCMachine.Spec.ProviderID = ptr.To[string](providerID)
 }
 

diff --git a/pkg/scope/provider.go b/pkg/scope/provider.go
@@ -96,5 +96,5 @@ const ProviderIDPrefix = "huaweicloud://"
 //
 // By default, the last id provided is used as identifier (last part).
 func GenerateProviderID(ids ...string) string {
-	return fmt.Sprintf("%s/%s", ProviderIDPrefix, strings.Join(ids, "/"))
+	return fmt.Sprintf("%s%s", ProviderIDPrefix, strings.Join(ids, "/"))
 }
diff --git a/pkg/services/ecs/instance.go b/pkg/services/ecs/instance.go
@@ -184,7 +184,7 @@ func (s *Service) CreateInstance(scope *scope.MachineScope, userData []byte,
 	}
 
 	// Set the providerID and instanceID as soon as we create an instance so that we keep it in case of errors afterward
-	scope.SetProviderID(out.ID, out.AvailabilityZone)
+	scope.SetProviderID(out.ID)
 	scope.SetInstanceID(out.ID)
 
 	return out, nil
@@ -195,7 +195,6 @@ func (s *Service) runInstance(i *infrav1.Instance) (*infrav1.Instance, error) {
 		XClientToken: ptr.To(string(uuid.NewUUID())),
 		Body: &ecsModel.CreateServersRequestBody{
 			Server: &ecsModel.PrePaidServer{
-				AdminPass: ptr.To("dangerous@2025"),
 				Name:      generateInstanceName("caphw-ecs"),
 				ImageRef:  i.ImageID,
 				FlavorRef: i.Type,