Merge pull request #14 from tencentcloudstack/fix/packerId

tongyiming · web-flow · commit d605d9219eb3 · 2025-05-21T17:34:24.000+08:00
fix: support concurrent
diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go
@@ -116,7 +116,8 @@ var ValidCBSType = []string{
 }
 
 func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error {
-	packerId := fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()[:8])
+	timeOrderedUUID := uuid.TimeOrderedUUID()
+	packerId := fmt.Sprintf("packer_%s_%s", timeOrderedUUID[:8], timeOrderedUUID[9:13])
 	if cf.Comm.SSHKeyPairName == "" && cf.Comm.SSHTemporaryKeyPairName == "" &&
 		cf.Comm.SSHPrivateKeyFile == "" && cf.Comm.SSHPassword == "" && cf.Comm.WinRMPassword == "" {
 		//tencentcloud support key pair name length max to 25

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ var ValidCBSType = []string{`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`func (cf TencentCloudRunConfig) Prepare(ctx interpolate.Context) []error {`
`119`		`- packerId := fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()[:8])`
	`119`	`+ timeOrderedUUID := uuid.TimeOrderedUUID()`
	`120`	`+ packerId := fmt.Sprintf("packer_%s_%s", timeOrderedUUID[:8], timeOrderedUUID[9:13])`
`120`	`121`	`if cf.Comm.SSHKeyPairName == "" && cf.Comm.SSHTemporaryKeyPairName == "" &&`
`121`	`122`	`cf.Comm.SSHPrivateKeyFile == "" && cf.Comm.SSHPassword == "" && cf.Comm.WinRMPassword == "" {`
`122`	`123`	`//tencentcloud support key pair name length max to 25`