Install yip config files in before-install step

This change allows to use after-install hooks as part of
a machine registration.

Fixes a regression introduced by df1961d

Signed-off-by: David Cassany <[email protected]>
(cherry picked from commit d784315)

Author: davidcassany

…_testdata/after-hook-config-install.yaml …testdata/before-hook-config-install.yamlpkg/install/_testdata/after-hook-config-install.yaml renamed to pkg/install/_testdata/before-hook-config-install.yaml pkg/install/_testdata/after-hook-config-install.yaml renamed to pkg/install/_testdata/before-hook-config-install.yaml

@@ -1,6 +1,6 @@
 name: Elemental Finalize System
 stages:
-    after-install:
+    before-install:
         - files:
             - path: /run/elemental/oem/elemental-registration.yaml
               permissions: 384

…l/_testdata/after-hook-config-reset.yaml …/_testdata/before-hook-config-reset.yamlpkg/install/_testdata/after-hook-config-reset.yaml renamed to pkg/install/_testdata/before-hook-config-reset.yaml pkg/install/_testdata/after-hook-config-reset.yaml renamed to pkg/install/_testdata/before-hook-config-reset.yaml

@@ -1,6 +1,6 @@
 name: Elemental Finalize System
 stages:
-    after-reset:
+    before-reset:
         - files:
             - path: /oem/elemental-registration.yaml
               permissions: 384

pkg/install/install.go

@@ -51,10 +51,10 @@ const (
 )
 
 const (
-	afterInstallStage = "after-install"
-	afterResetStage   = "after-reset"
-	// Used in after-{install|reset} stages
-	elementalAfterHook = "elemental-after-hook.yaml"
+	beforeInstallStage = "before-install"
+	beforeResetStage   = "before-reset"
+	// Used in before-{install|reset} stages
+	elementalBeforeHook = "elemental-before-hook.yaml"
 
 	// Deterministic Elemental yip paths
 	registrationConfigPath = "elemental-registration.yaml"
@@ -109,8 +109,8 @@ func (i *installer) InstallElemental(config elementalv1.Config, state register.S
 		log.Warningf("Both device and device-selector set, using device-field '%s'", config.Elemental.Install.Device)
 	}
 
-	if err := i.writeAfterHookConfigurator(afterInstallStage, installOEMMount, config, state, networkConfig); err != nil {
-		return fmt.Errorf("writing %s configurator: %w", afterInstallStage, err)
+	if err := i.writeHookConfigurator(beforeInstallStage, installOEMMount, config, state, networkConfig); err != nil {
+		return fmt.Errorf("writing %s configurator: %w", beforeInstallStage, err)
 	}
 
 	if err := i.runner.Install(config.Elemental.Install); err != nil {
@@ -126,8 +126,8 @@ func (i *installer) ResetElemental(config elementalv1.Config, state register.Sta
 		config.Elemental.Reset.ConfigURLs = []string{}
 	}
 
-	if err := i.writeAfterHookConfigurator(afterResetStage, resetOEMMount, config, state, networkConfig); err != nil {
-		return fmt.Errorf("writing %s configurator: %w", afterResetStage, err)
+	if err := i.writeHookConfigurator(beforeResetStage, resetOEMMount, config, state, networkConfig); err != nil {
+		return fmt.Errorf("writing %s configurator: %w", beforeResetStage, err)
 	}
 
 	if err := i.runner.Reset(config.Elemental.Reset); err != nil {
@@ -242,7 +242,7 @@ func matchesGt(disk *block.Disk, req elementalv1.DeviceSelectorRequirement) (boo
 	return diskSize.Cmp(keySize) == 1, nil
 }
 
-func (i *installer) writeAfterHookConfigurator(stage string, oemMount string, config elementalv1.Config, state register.State, networkConfig elementalv1.NetworkConfig) error {
+func (i *installer) writeHookConfigurator(stage string, oemMount string, config elementalv1.Config, state register.State, networkConfig elementalv1.NetworkConfig) error {
 	afterHookConfigurator := schema.YipConfig{}
 	afterHookConfigurator.Name = "Elemental Finalize System"
 	afterHookConfigurator.Stages = map[string][]schema.Stage{
@@ -254,31 +254,31 @@ func (i *installer) writeAfterHookConfigurator(stage string, oemMount string, co
 	if err != nil {
 		return fmt.Errorf("getting registration config yip: %w", err)
 	}
-	registrationYip := yipAfterHookWrap(string(registrationYipBytes), filepath.Join(oemMount, registrationConfigPath), "Registration Config")
+	registrationYip := yipHookWrap(string(registrationYipBytes), filepath.Join(oemMount, registrationConfigPath), "Registration Config")
 	afterHookConfigurator.Stages[stage] = append(afterHookConfigurator.Stages[stage], registrationYip)
 
 	// State
 	stateYipBytes, err := i.registrationStateYip(state)
 	if err != nil {
 		return fmt.Errorf("getting registration state config yip: %w", err)
 	}
-	stateYip := yipAfterHookWrap(string(stateYipBytes), filepath.Join(oemMount, stateConfigPath), "Registration State Config")
+	stateYip := yipHookWrap(string(stateYipBytes), filepath.Join(oemMount, stateConfigPath), "Registration State Config")
 	afterHookConfigurator.Stages[stage] = append(afterHookConfigurator.Stages[stage], stateYip)
 
 	// Cloud Init
 	cloudInitYipBytes, err := i.cloudInitYip(config.CloudConfig)
 	if err != nil {
 		return fmt.Errorf("getting cloud-init config yip: %w", err)
 	}
-	cloudInitYip := yipAfterHookWrap(string(cloudInitYipBytes), filepath.Join(oemMount, cloudInitConfigPath), "Cloud Init Config")
+	cloudInitYip := yipHookWrap(string(cloudInitYipBytes), filepath.Join(oemMount, cloudInitConfigPath), "Cloud Init Config")
 	afterHookConfigurator.Stages[stage] = append(afterHookConfigurator.Stages[stage], cloudInitYip)
 
 	// Elemental System Agent
 	systemAgentYipBytes, err := i.elementalSystemAgentYip(config.Elemental)
 	if err != nil {
 		return fmt.Errorf("getting elemental system agent config yip: %w", err)
 	}
-	systemAgentYip := yipAfterHookWrap(string(systemAgentYipBytes), filepath.Join(oemMount, systemAgentConfigPath), "Elemental System Agent Config")
+	systemAgentYip := yipHookWrap(string(systemAgentYipBytes), filepath.Join(oemMount, systemAgentConfigPath), "Elemental System Agent Config")
 	afterHookConfigurator.Stages[stage] = append(afterHookConfigurator.Stages[stage], systemAgentYip)
 
 	// Network Config
@@ -287,7 +287,7 @@ func (i *installer) writeAfterHookConfigurator(stage string, oemMount string, co
 		return fmt.Errorf("getting network config yip: %w", err)
 	}
 	if !errors.Is(err, network.ErrEmptyConfig) {
-		networkConfigYip := yipAfterHookWrap(string(networkConfigYipBytes), filepath.Join(oemMount, networkConfigPath), "Network Config")
+		networkConfigYip := yipHookWrap(string(networkConfigYipBytes), filepath.Join(oemMount, networkConfigPath), "Network Config")
 		afterHookConfigurator.Stages[stage] = append(afterHookConfigurator.Stages[stage], networkConfigYip)
 	}
 
@@ -296,9 +296,9 @@ func (i *installer) writeAfterHookConfigurator(stage string, oemMount string, co
 		return fmt.Errorf("creating directory '%s': %w", elementalcli.TempCloudInitDir, err)
 	}
 	// Create the after hook configurator yip
-	f, err := i.fs.Create(filepath.Join(elementalcli.TempCloudInitDir, elementalAfterHook))
+	f, err := i.fs.Create(filepath.Join(elementalcli.TempCloudInitDir, elementalBeforeHook))
 	if err != nil {
-		return fmt.Errorf("creating file '%s': %w", filepath.Join(elementalcli.TempCloudInitDir, elementalAfterHook), err)
+		return fmt.Errorf("creating file '%s': %w", filepath.Join(elementalcli.TempCloudInitDir, elementalBeforeHook), err)
 	}
 	defer f.Close()
 
@@ -309,7 +309,7 @@ func (i *installer) writeAfterHookConfigurator(stage string, oemMount string, co
 	return nil
 }
 
-func yipAfterHookWrap(content string, path string, name string) schema.Stage {
+func yipHookWrap(content string, path string, name string) schema.Stage {
 	config := schema.Stage{Name: name}
 	config.Files = []schema.File{
 		{

pkg/install/install_test.go

@@ -146,7 +146,7 @@ var _ = Describe("installer install elemental", Label("installer", "install"), f
 		cliRunner.EXPECT().Install(configFixture.Elemental.Install).Return(nil)
 		networkConfigurator.EXPECT().GetNetworkConfigApplicator(networkConfigFixture).Return(networkConfigApplicatorFixture, nil)
 		Expect(install.InstallElemental(configFixture, stateFixture, networkConfigFixture)).ToNot(HaveOccurred())
-		compareFiles(fs, filepath.Join(elementalcli.TempCloudInitDir, elementalAfterHook), "_testdata/after-hook-config-install.yaml")
+		compareFiles(fs, filepath.Join(elementalcli.TempCloudInitDir, elementalBeforeHook), "_testdata/before-hook-config-install.yaml")
 	})
 })
 
@@ -297,7 +297,7 @@ var _ = Describe("installer reset elemental", Label("installer", "reset"), func(
 		cliRunner.EXPECT().Reset(configFixture.Elemental.Reset).Return(nil)
 		networkConfigurator.EXPECT().GetNetworkConfigApplicator(networkConfigFixture).Return(networkConfigApplicatorFixture, nil)
 		Expect(install.ResetElemental(configFixture, stateFixture, networkConfigFixture)).ToNot(HaveOccurred())
-		compareFiles(fs, filepath.Join(elementalcli.TempCloudInitDir, elementalAfterHook), "_testdata/after-hook-config-reset.yaml")
+		compareFiles(fs, filepath.Join(elementalcli.TempCloudInitDir, elementalBeforeHook), "_testdata/before-hook-config-reset.yaml")
 	})
 	It("should remove reset plan", func() {
 		Expect(fs.WriteFile(controllers.LocalResetPlanPath, []byte("{}\n"), os.FileMode(0600))).ToNot(HaveOccurred())