Rollback changes done by golang 1.11 fmt to golang 1.10 fmt

[#157787189](https://www.pivotaltracker.com/story/show/157787189) Signed-off-by: Dale Wick <dwick@pivotal.io> Co-authored-by: Dale Wick <dwick@pivotal.io>
cloudfoundry · Aug 27, 2018 · 2410193 · 2410193
1 parent c1b4f5d
commit 2410193
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 51 deletions.
diff --git a/cmd/basic_deps.go b/cmd/basic_deps.go
@@ -46,7 +46,7 @@ func NewBasicDepsWithFS(ui *boshui.ConfUI, fs boshsys.FileSystem, logger boshlog
 		Compressor:               boshcmd.NewTarballCompressor(cmdRunner, fs),
 		DigestCalculator:         digestCalculator,
 		DigestCreationAlgorithms: digestCreationAlgorithms,
-		Time:                     clock.NewClock(),
+		Time: clock.NewClock(),
 	}
 }
 

diff --git a/cmd/redigest_release.go b/cmd/redigest_release.go
@@ -29,12 +29,12 @@ func NewRedigestReleaseCmd(
 	ui boshui.UI,
 ) RedigestReleaseCmd {
 	return RedigestReleaseCmd{
-		reader:                reader,
-		writer:                writer,
-		digestCalculator:      digestCalculator,
-		mv:                    mv,
+		reader:           reader,
+		writer:           writer,
+		digestCalculator: digestCalculator,
+		mv:               mv,
 		archiveFilePathReader: archiveFilePathReader,
-		ui:                    ui,
+		ui: ui,
 	}
 }
 

diff --git a/cmd/upload_stemcell.go b/cmd/upload_stemcell.go
@@ -23,7 +23,7 @@ func NewUploadStemcellCmd(
 	return UploadStemcellCmd{
 		director:               director,
 		stemcellArchiveFactory: stemcellArchiveFactory,
-		ui:                     ui,
+		ui: ui,
 	}
 }
 

diff --git a/cmd/var_flags_test.go b/cmd/var_flags_test.go
@@ -57,8 +57,8 @@ var _ = Describe("VarFlags", func() {
 						"kv_env_precedence":      "env2",
 						"file_env_precedence":    "env2",
 						"kv_file_env_precedence": "env2",
-						"env2":                   "env2",
-						"env_precedence":         "env2",
+						"env2":           "env2",
+						"env_precedence": "env2",
 					}},
 				},
 			}
@@ -71,16 +71,16 @@ var _ = Describe("VarFlags", func() {
 				"var_file":                 "var_file",
 				"var_file_precedence":      "var_file2",
 				"var_file_file_precedence": "var_file",
-				"file":                     "file",
-				"file_precedence":          "file2",
-				"kv_file_precedence":       "kv",
-				"file2":                    "file2",
-				"env2":                     "env2",
-				"env":                      "env",
-				"env_precedence":           "env2",
-				"kv_file_env_precedence":   "kv",
-				"file_env_precedence":      "file2",
-				"kv_env_precedence":        "kv",
+				"file":                   "file",
+				"file_precedence":        "file2",
+				"kv_file_precedence":     "kv",
+				"file2":                  "file2",
+				"env2":                   "env2",
+				"env":                    "env",
+				"env_precedence":         "env2",
+				"kv_file_env_precedence": "kv",
+				"file_env_precedence":    "file2",
+				"kv_env_precedence":      "kv",
 			}
 
 			for key, expectedVal := range expectedVals {

diff --git a/config/legacy_deployment_state_migrator.go b/config/legacy_deployment_state_migrator.go
@@ -33,10 +33,10 @@ func NewLegacyDeploymentStateMigrator(
 ) LegacyDeploymentStateMigrator {
 	return &legacyDeploymentStateMigrator{
 		deploymentStateService: deploymentStateService,
-		fs:                     fs,
-		uuidGenerator:          uuidGenerator,
-		logger:                 logger,
-		logTag:                 "legacyDeploymentStateMigrator",
+		fs:            fs,
+		uuidGenerator: uuidGenerator,
+		logger:        logger,
+		logTag:        "legacyDeploymentStateMigrator",
 	}
 }
 

diff --git a/deployment/instance/state/builder_factory.go b/deployment/instance/state/builder_factory.go
@@ -34,7 +34,7 @@ func NewBuilderFactory(
 		releaseJobResolver:        releaseJobResolver,
 		jobRenderer:               jobRenderer,
 		renderedJobListCompressor: renderedJobListCompressor,
-		logger:                    logger,
+		logger: logger,
 	}
 }
 

diff --git a/director/info_test.go b/director/info_test.go
@@ -128,7 +128,7 @@ var _ = Describe("Director", func() {
 				Features: map[string]bool{
 					"snapshots":              false,
 					"compiled_package_cache": true,
-					"dns":                    false,
+					"dns": false,
 				},
 
 				CPI: "cpi",

diff --git a/installation/installer_factory.go b/installation/installer_factory.go
@@ -48,28 +48,28 @@ func NewInstallerFactory(
 	digestCreateAlgorithms []boshcrypto.Algorithm,
 ) InstallerFactory {
 	return &installerFactory{
-		ui:                     ui,
-		runner:                 runner,
-		extractor:              extractor,
-		releaseJobResolver:     releaseJobResolver,
-		uuidGenerator:          uuidGenerator,
-		registryServerManager:  registryServerManager,
-		logger:                 logger,
-		logTag:                 "installer",
-		fs:                     fs,
+		ui:                    ui,
+		runner:                runner,
+		extractor:             extractor,
+		releaseJobResolver:    releaseJobResolver,
+		uuidGenerator:         uuidGenerator,
+		registryServerManager: registryServerManager,
+		logger:                logger,
+		logTag:                "installer",
+		fs:                    fs,
 		digestCreateAlgorithms: digestCreateAlgorithms,
 	}
 }
 
 func (f *installerFactory) NewInstaller(target Target) Installer {
 	context := &installerFactoryContext{
-		target:                 target,
-		runner:                 f.runner,
-		logger:                 f.logger,
-		extractor:              f.extractor,
-		uuidGenerator:          f.uuidGenerator,
-		releaseJobResolver:     f.releaseJobResolver,
-		fs:                     f.fs,
+		target:             target,
+		runner:             f.runner,
+		logger:             f.logger,
+		extractor:          f.extractor,
+		uuidGenerator:      f.uuidGenerator,
+		releaseJobResolver: f.releaseJobResolver,
+		fs:                 f.fs,
 		digestCreateAlgorithms: f.digestCreateAlgorithms,
 	}
 

diff --git a/installation/package_compiler.go b/installation/package_compiler.go
@@ -30,7 +30,7 @@ func NewPackageCompiler(
 ) PackageCompiler {
 	return &packageCompiler{
 		jobDependencyCompiler: jobDependencyCompiler,
-		fs:                    fs,
+		fs: fs,
 	}
 }
 

diff --git a/releasedir/provider.go b/releasedir/provider.go
@@ -45,15 +45,15 @@ func NewProvider(
 	logger boshlog.Logger,
 ) Provider {
 	return Provider{
-		indexReporter:          indexReporter,
-		releaseIndexReporter:   releaseIndexReporter,
-		blobsReporter:          blobsReporter,
-		releaseProvider:        releaseProvider,
-		digestCalculator:       digestCalculator,
-		cmdRunner:              cmdRunner,
-		uuidGen:                uuidGen,
-		timeService:            timeService,
-		fs:                     fs,
+		indexReporter:        indexReporter,
+		releaseIndexReporter: releaseIndexReporter,
+		blobsReporter:        blobsReporter,
+		releaseProvider:      releaseProvider,
+		digestCalculator:     digestCalculator,
+		cmdRunner:            cmdRunner,
+		uuidGen:              uuidGen,
+		timeService:          timeService,
+		fs:                   fs,
 		digestCreateAlgorithms: digestCreateAlgorithms,
 		logger:                 logger,
 	}