fix cloud init order

sp-yduck · sp-yduck · commit 4d6b37a75d94 · 2023-08-08T22:23:01.000+09:00
diff --git a/cloud/services/compute/instance/cloudinit.go b/cloud/services/compute/instance/cloudinit.go
@@ -90,16 +90,16 @@ func (s *Service) reconcileCloudInitUser(ctx context.Context) error {
 func mergeUserDatas(a, b, c *infrav1.User) (*infrav1.User, error) {
 	var err error
 	if c != nil {
-		b, err = cloudinit.MergeUsers(b, c)
+		c, err = cloudinit.MergeUsers(c, b)
 		if err != nil {
 			return nil, err
 		}
 	}
-	a, err = cloudinit.MergeUsers(a, b)
+	c, err = cloudinit.MergeUsers(c, a)
 	if err != nil {
 		return nil, err
 	}
-	return a, err
+	return c, err
 }
 
 func userSnippetPath(vmName string) string {

Original file line number	Diff line number	Diff line change
`@@ -90,16 +90,16 @@ func (s *Service) reconcileCloudInitUser(ctx context.Context) error {`
`90`	`90`	`func mergeUserDatas(a, b, c infrav1.User) (infrav1.User, error) {`
`91`	`91`	`var err error`
`92`	`92`	`if c != nil {`
`93`		`- b, err = cloudinit.MergeUsers(b, c)`
	`93`	`+ c, err = cloudinit.MergeUsers(c, b)`
`94`	`94`	`if err != nil {`
`95`	`95`	`return nil, err`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`- a, err = cloudinit.MergeUsers(a, b)`
	`98`	`+ c, err = cloudinit.MergeUsers(c, a)`
`99`	`99`	`if err != nil {`
`100`	`100`	`return nil, err`
`101`	`101`	`}`
`102`		`- return a, err`
	`102`	`+ return c, err`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func userSnippetPath(vmName string) string {`