afero symlinker

.travis.yml

@@ -18,3 +18,6 @@ jobs:
     - stage: check
       script:
         - if [[ ! -z "${SNYK_TOKEN}" ]]; then snyk monitor --org=czi; snyk test; fi
+    - stage: check
+      script:
+        - curl --data-binary @codecov.yml https://codecov.io/validate

Gopkg.toml

@@ -12,7 +12,8 @@
 
 [[constraint]]
   name = "github.com/spf13/afero"
-  version = "1.1.1"
+  source = "github.com/chanzuckerberg/afero"
+  branch = "symlinker"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
@@ -53,3 +54,4 @@
 [[constraint]]
   name = "gopkg.in/yaml.v2"
   version = "2.2.1"
+

Makefile

@@ -45,7 +45,7 @@ coverage: ## run the go coverage tool, reading file coverage.out
 	go tool cover -html=coverage.out
 
 test: dep ## run tests
-	gotest -race ./...
+	gotest -race -cover ./...
 
 test-coverage: ## run the test with proper coverage reporting
 	goverage -race -coverprofile=coverage.out -covermode=atomic ./...
@@ -69,8 +69,4 @@ dep: ## ensure dependencies are vendored
 	dep ensure # this should be super-fast in the no-op case
 .PHONY: dep
 
-dep:
-	dep ensure
-.PHONY: dep
-
 .PHONY: build clean coverage test install lint lint-slow packr release help setup

apply/apply.go

@@ -225,7 +225,13 @@ func applyTree(dest afero.Fs, source *packr.Box, targetBasePath string, subst in
 
 			linkTarget := string(linkTargetBytes)
 
-			err = linkFile(target, linkTarget)
+			linker, ok := dest.(afero.Symlinker)
+
+			if !ok {
+				return errs.NewInternal("can't cast to afero.SymLinker")
+			}
+
+			_, err = linker.SymlinkIfPossible(target, linkTarget)
 			if err != nil {
 				return errs.WrapInternal(err, "can't symlink file")
 			}
@@ -425,18 +431,6 @@ func getTargetPath(basePath, path string) string {
 	return target
 }
 
-func linkFile(name, target string) error {
-	log.Debugf("removing link at %s", name)
-	os.Remove(name)
-	log.Debugf("linking %s to %s", name, target)
-	relativePath, err := filepathRel(name, target)
-	log.Debugf("relative link %s err %#v", relativePath, err)
-	if err != nil {
-		return err
-	}
-	return os.Symlink(relativePath, name)
-}
-
 func filepathRel(path, name string) (string, error) {
 	dirs := strings.Count(path, "/")
 	fullPath := fmt.Sprintf("%s/%s", strings.Repeat("../", dirs), name)

apply/apply_test.go

@@ -191,14 +191,15 @@ func TestCreateFileNonExistentDirectory(t *testing.T) {
 }
 
 func TestApplySmokeTest(t *testing.T) {
-	t.Skip("doesn't currently work because afero doesn't support symlinks")
-	// We have to use a BasePathFs so that we can calculate `RealPath` for symlinking. Afero doesn't support symlinks
 	fs := afero.NewBasePathFs(afero.NewMemMapFs(), "/")
 	json := `
 {
   "defaults": {
-    "aws_region": "reg",
-    "aws_profile": "prof",
+    "aws_region_provider": "reg",
+    "aws_region_backend": "reg",
+    "aws_profile_provider": "prof",
+    "aws_profile_backend": "prof",
+    "aws_provider_version": "0.12.0",
     "infra_s3_bucket": "buck",
     "project": "proj",
     "terraform_version": "0.100.0",
@@ -237,6 +238,9 @@ func TestApplySmokeTest(t *testing.T) {
 	c2, e := config.UpgradeConfigVersion(c)
 	assert.NoError(t, e)
 
+	e = c2.Validate()
+	assert.NoError(t, e)
+
 	e = Apply(fs, c2, templates.Templates, false)
 	assert.NoError(t, e)
 }

codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "vendor"