Try to upload archive files also

steffentemplin · Apr 2, 2018 · 83c1bf0 · 83c1bf0
1 parent e8752fb
commit 83c1bf0
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 92 deletions.
diff --git a/builtin/provisioners/chef/linux_provisioner_test.go b/builtin/provisioners/chef/linux_provisioner_test.go
@@ -157,6 +157,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
 
 		p, err := decodeConfig(
 			schema.TestResourceDataRaw(t, Provisioner().(*schema.Provisioner).Schema, tc.Config),
+			"linux",
 		)
 		if err != nil {
 			t.Fatalf("Error: %v", err)
@@ -287,7 +288,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
 		"LocalMode": {
 			Config: map[string]interface{}{
 				"use_local_mode": true,
-				"chef_repo":      "tbd",
+				"chef_repo":      os.TempDir(),
 				"run_list":       []interface{}{"role[testrole]"},
 				"environment":    "testenv",
 				"node_name":      "testnode",
@@ -313,7 +314,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
 		"LocalModePolicy": {
 			Config: map[string]interface{}{
 				"use_local_mode": true,
-				"chef_repo":      "tbd",
+				"chef_repo":      os.TempDir(),
 				"use_policyfile": true,
 				"policy_name":    "testpolicy",
 			},
@@ -345,6 +346,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
 
 		p, err := decodeConfig(
 			schema.TestResourceDataRaw(t, Provisioner().(*schema.Provisioner).Schema, tc.Config),
+			"linux",
 		)
 		if err != nil {
 			t.Fatalf("Error: %v", err)
@@ -468,6 +470,47 @@ func TestResourceProvider_linuxDeployChefRepo(t *testing.T) {
 				return testDeleteTmpFiles(self.Config["chef_repo"].(string))
 			},
 		},
+
+		"LocalModePolicyRepoFile": {
+			Config: map[string]interface{}{
+				"use_local_mode": true,
+				"chef_repo":      "tbd",
+				"use_policyfile": true,
+				"policy_name":    "testpolicy",
+			},
+
+			Commands: map[string]bool{
+				// prepare var dir for upload
+				"sudo mkdir -p " + linuxRepoDir:                 true,
+				"sudo chmod 777 " + linuxRepoDir:                true,
+				"sudo " + fmt.Sprintf(chmod, linuxRepoDir, 666): true,
+				// client run
+				"sudo sh -c 'cd /var/chef && chef-client -z -j /etc/chef/first-boot.json'": true,
+				"sudo chef-client -z -j /etc/chef/first-boot.json":                         false,
+			},
+
+			Uploads: map[string]string{},
+
+			SetUp: func(t *testing.T, self createConfigTestCase) error {
+				archName := "testrepo.tgz"
+				layout := map[string][]string{
+					"": []string{archName},
+				}
+				tmpDir, err := testCreateTmpFiles(layout)
+				if err != nil {
+					return err
+				}
+
+				repoFile := path.Join(tmpDir, archName)
+				self.Config["chef_repo"] = repoFile
+				self.Uploads[path.Join(linuxRepoDir, archName)] = ""
+				return nil
+			},
+
+			TearDown: func(t *testing.T, self createConfigTestCase) error {
+				return testDeleteTmpFiles(self.Config["chef_repo"].(string))
+			},
+		},
 	}
 
 	o := new(terraform.MockUIOutput)
@@ -491,6 +534,7 @@ func TestResourceProvider_linuxDeployChefRepo(t *testing.T) {
 
 		p, err := decodeConfig(
 			schema.TestResourceDataRaw(t, Provisioner().(*schema.Provisioner).Schema, tc.Config),
+			"linux",
 		)
 		if err != nil {
 			t.Fatalf("Error: %v", err)