From ecadaeac5f8118beebdd391b577759f3cfc0fd8f Mon Sep 17 00:00:00 2001 From: Harish Yayi Date: Mon, 5 Aug 2024 14:08:32 -0400 Subject: [PATCH] remove deprecated methods and use alternative methods --- acceptance/config_template_test.go | 21 ++-- acceptance/configure_director_test.go | 10 +- acceptance/configure_product_test.go | 5 +- acceptance/download_product_azure_test.go | 5 +- acceptance/download_product_gcs_test.go | 21 ++-- acceptance/download_product_pivnet_test.go | 13 ++- acceptance/download_product_s3_test.go | 27 +++--- acceptance/export_installation_test.go | 6 +- acceptance/global_env_file_test.go | 3 +- acceptance/global_env_var_test.go | 7 +- acceptance/global_flag_test.go | 6 +- acceptance/import_installation_test.go | 3 +- acceptance/init_test.go | 3 +- acceptance/interpolate_test.go | 3 +- acceptance/product_metadata_test.go | 7 +- acceptance/trace_test.go | 5 +- acceptance/upload_product_test.go | 7 +- acceptance/upload_stemcell_test.go | 7 +- api/bosh_environment_service.go | 4 +- api/certificates_service.go | 4 +- api/diagnostic_service.go | 4 +- api/diff_service.go | 6 +- api/director_service.go | 10 +- api/disable_director_verifiers_service.go | 4 +- api/disable_product_verifiers_service.go | 4 +- api/info_service_test.go | 6 +- api/installation_asset_service_test.go | 5 +- api/pending_changes_service.go | 4 +- api/pre_deploy_check_service.go | 4 +- api/setup_service.go | 4 +- api/staged_products_service.go | 4 +- api/staged_products_service_test.go | 8 +- api/vm_extensions_service.go | 4 +- api/vm_types_service.go | 4 +- commands/apply_changes_test.go | 5 +- commands/bosh_environment_test.go | 9 +- commands/config_template_test.go | 6 +- commands/configure_director_test.go | 13 ++- commands/configure_opsman_test.go | 4 +- commands/configure_product_test.go | 29 +++--- commands/create_vm_extension_test.go | 17 ++-- commands/curl.go | 3 +- commands/curl_test.go | 9 +- commands/download_product.go | 3 +- commands/download_product_test.go | 97 +++++++++---------- commands/import_installation_test.go | 26 +++-- commands/init_test.go | 5 +- commands/interpolate.go | 6 +- commands/interpolate_test.go | 45 +++++---- commands/stage_product.go | 8 +- commands/upload_product_test.go | 13 ++- commands/upload_stemcell_test.go | 29 +++--- configtemplate/generator/execute.go | 5 +- configtemplate/generator/execute_test.go | 7 +- .../integration/product_properties_test.go | 11 ++- configtemplate/generator/metadata_test.go | 4 +- depstability/dependency_stability_test.go | 6 +- docsgenerator/generator/generate.go | 3 +- docsgenerator/generator/generator_test.go | 29 +++--- docstest/docs_test.go | 3 +- download_clients/pivnet_client_test.go | 8 +- download_clients/s3_client_test.go | 8 +- download_clients/stow_client_test.go | 9 +- extractor/from_file.go | 7 +- extractor/metadata_extractor_test.go | 5 +- formcontent/formcontent_test.go | 26 ++--- interpolate/execute.go | 6 +- interpolate/interpolate_suite_test.go | 6 +- network/decrypt_client.go | 3 +- network/decrypt_client_test.go | 10 +- network/http_client.go | 16 +-- network/init_test.go | 6 +- network/progress_client_test.go | 14 +-- network/trace_client_test.go | 6 +- network/unauthenticated_client_test.go | 6 +- validator/sha256_calculator_test.go | 6 +- vmlifecycle/acceptance/create_vm_test.go | 4 +- vmlifecycle/acceptance/delete_vm_test.go | 4 +- .../acceptance/integration_suite_test.go | 3 +- vmlifecycle/acceptance/upgrade_opsman_test.go | 7 +- vmlifecycle/configfetchers/initialize.go | 6 +- vmlifecycle/configfetchers/initialize_test.go | 3 +- vmlifecycle/taskmodifier/task_modifier.go | 8 +- .../taskmodifier/task_modifier_suite_test.go | 5 +- .../taskmodifier/task_modifier_test.go | 18 ++-- vmlifecycle/vmlifecyclecommands/create_vm.go | 3 +- .../vmlifecyclecommands/create_vm_test.go | 9 +- vmlifecycle/vmlifecyclecommands/delete_vm.go | 8 +- .../vmlifecyclecommands/delete_vm_test.go | 5 +- .../export_opsman_config.go | 8 +- .../export_opsman_config_test.go | 18 ++-- .../prepare-tasks-with-secrets_test.go | 12 +-- .../vmlifecyclecommands/unit_suite_test.go | 7 +- .../vmlifecyclecommands/upgrade_opsman.go | 6 +- .../upgrade_opsman_test.go | 39 ++++---- vmlifecycle/vmmanagers/aws.go | 5 +- vmlifecycle/vmmanagers/aws_test.go | 7 +- vmlifecycle/vmmanagers/azure.go | 6 +- vmlifecycle/vmmanagers/azure_test.go | 29 +++--- vmlifecycle/vmmanagers/gcp.go | 6 +- vmlifecycle/vmmanagers/gcp_test.go | 6 +- vmlifecycle/vmmanagers/openstack_test.go | 5 +- .../vmmanagers/vmmanagers_suite_test.go | 5 +- vmlifecycle/vmmanagers/vsphere.go | 13 +-- vmlifecycle/vmmanagers/vsphere_test.go | 7 +- 105 files changed, 502 insertions(+), 535 deletions(-) diff --git a/acceptance/config_template_test.go b/acceptance/config_template_test.go index d3d19c8fa..d151fce24 100644 --- a/acceptance/config_template_test.go +++ b/acceptance/config_template_test.go @@ -3,7 +3,6 @@ package acceptance import ( "bytes" "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -28,7 +27,7 @@ var _ = Describe("config-template command", func() { When("there is only one .pivotal file for the product version", func() { BeforeEach(func() { pivotalFile := createPivotalFile("[example-product,1.10.1]example*pivotal", "./fixtures/example-product.yml") - contents, err := ioutil.ReadFile(pivotalFile) + contents, err := os.ReadFile(pivotalFile) Expect(err).ToNot(HaveOccurred()) modTime := time.Now() @@ -85,7 +84,7 @@ var _ = Describe("config-template command", func() { }) It("writes a config template subdir for the product in the output directory", func() { - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) productSlug, productVersion := "example-product", "1.0-build.0" @@ -111,7 +110,7 @@ var _ = Describe("config-template command", func() { When("the metadata contains a required collection that contains a cert", func() { It("renders the cert fields appropriately in the product.yml", func() { - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) productSlug, metadataName, productVersion := "example-product", "example-product", "1.0-build.0" @@ -134,7 +133,7 @@ var _ = Describe("config-template command", func() { productYMLFile := filepath.Join(outputDir, metadataName, productVersion, "product.yml") Expect(productYMLFile).To(BeAnExistingFile()) - productYMLBytes, err := ioutil.ReadFile(productYMLFile) + productYMLBytes, err := os.ReadFile(productYMLFile) Expect(err).ToNot(HaveOccurred()) expectedYAML := `.properties.example_required_cert_collection: @@ -149,7 +148,7 @@ var _ = Describe("config-template command", func() { When("the metadata contains a required collection that contains a cert", func() { It("renders the cert fields appropriately in the product.yml", func() { - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) productSlug, metadataName, productVersion := "example-product", "example-product", "1.0-build.0" @@ -172,7 +171,7 @@ var _ = Describe("config-template command", func() { productYMLFile := filepath.Join(outputDir, metadataName, productVersion, "product.yml") Expect(productYMLFile).To(BeAnExistingFile()) - productYMLBytes, err := ioutil.ReadFile(productYMLFile) + productYMLBytes, err := os.ReadFile(productYMLFile) Expect(err).ToNot(HaveOccurred()) expectedYAML := `.properties.required_secret_collection: @@ -188,7 +187,7 @@ var _ = Describe("config-template command", func() { When("there is more than one .pivotal file for a product version", func() { BeforeEach(func() { pivotalFile := createPivotalFile("[example-product,1.10.1]example*pivotal", "./fixtures/example-product.yml") - contents, err := ioutil.ReadFile(pivotalFile) + contents, err := os.ReadFile(pivotalFile) Expect(err).ToNot(HaveOccurred()) modTime := time.Now() @@ -263,7 +262,7 @@ var _ = Describe("config-template command", func() { }) Context("and the user has not provided a product file glob", func() { It("errors because the default glob did not match", func() { - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) productSlug, productVersion := "another-example-product", "1.0-build.0" @@ -286,7 +285,7 @@ var _ = Describe("config-template command", func() { }) Context("and the user has provided a glob with a unique match", func() { It("writes a config template subdir for the product in the output directory", func() { - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) productSlug, productVersion := "another-example-product", "1.0-build.0" @@ -320,7 +319,7 @@ var _ = Describe("config-template output", func() { Skip("TEST_PIVNET_TOKEN not specified") } - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, diff --git a/acceptance/configure_director_test.go b/acceptance/configure_director_test.go index f8ede63a8..bbf4966a9 100644 --- a/acceptance/configure_director_test.go +++ b/acceptance/configure_director_test.go @@ -1,8 +1,8 @@ package acceptance import ( - "io/ioutil" "net/http" + "os" "os/exec" "github.com/onsi/gomega/ghttp" @@ -36,7 +36,7 @@ var _ = Describe("configure-director command", func() { }) It("displays a helpful error message when using moved director properties", func() { - configFile, err := ioutil.TempFile("", "config.yml") + configFile, err := os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(`{ "iaas-configuration": { @@ -93,7 +93,7 @@ var _ = Describe("configure-director command", func() { Expect(session.Err).To(gbytes.Say("The following keys have recently been removed from the top level configuration: director-configuration, iaas-configuration, security-configuration, syslog-configuration")) Expect(session.Err).To(gbytes.Say("To fix this error, move the above keys under 'properties-configuration' and change their dashes to underscores.")) - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(`{ "what is this": "key?" @@ -282,7 +282,7 @@ iaas-configurations: } `) - tempfile, err := ioutil.TempFile("", "config.yaml") + tempfile, err := os.CreateTemp("", "config.yaml") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.Write(configYAML) @@ -375,7 +375,7 @@ iaas-configurations: } `) - tempfile, err := ioutil.TempFile("", "config.yaml") + tempfile, err := os.CreateTemp("", "config.yaml") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.Write(configYAML) diff --git a/acceptance/configure_product_test.go b/acceptance/configure_product_test.go index b75594c1b..8d2c60611 100644 --- a/acceptance/configure_product_test.go +++ b/acceptance/configure_product_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -171,7 +170,7 @@ var _ = Describe("configure-product command", func() { ), ) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configFileContents) @@ -257,7 +256,7 @@ var _ = Describe("configure-product command", func() { "resource-config": %s }`, propertiesJSON, productNetworkJSON, nsxResourceConfigJSON) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(nsxConfigFileContents) diff --git a/acceptance/download_product_azure_test.go b/acceptance/download_product_azure_test.go index 12d5f0770..426776aef 100644 --- a/acceptance/download_product_azure_test.go +++ b/acceptance/download_product_azure_test.go @@ -1,7 +1,6 @@ package acceptance import ( - "io/ioutil" "os" "os/exec" "path/filepath" @@ -62,7 +61,7 @@ var _ = Describe("download-product command", func() { az("storage", "blob", "upload", "--overwrite", "-f", pivotalFile, "-n", "/some/product/[pivnet-example-slug,1.10.1]example-product.pivotal") az("storage", "blob", "upload", "--overwrite", "-f", pivotalFile, "-n", "/another/stemcell/[stemcells-ubuntu-xenial,97.57]light-bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "example-product.pivotal", @@ -91,7 +90,7 @@ var _ = Describe("download-product command", func() { Expect(filepath.Join(tmpDir, "[stemcells-ubuntu-xenial,97.57]light-bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz.partial")).ToNot(BeAnExistingFile()) By("ensuring an assign stemcell artifact is created") - contents, err := ioutil.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) + contents, err := os.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) Expect(err).ToNot(HaveOccurred()) Expect(string(contents)).To(MatchYAML(`{product: example-product, stemcell: "97.57"}`)) diff --git a/acceptance/download_product_gcs_test.go b/acceptance/download_product_gcs_test.go index 21c7d2b8e..a24a0a992 100644 --- a/acceptance/download_product_gcs_test.go +++ b/acceptance/download_product_gcs_test.go @@ -3,7 +3,6 @@ package acceptance import ( "encoding/json" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -49,9 +48,9 @@ var _ = Describe("download-product command", func() { }{} err = json.Unmarshal([]byte(serviceAccountKey), &clientEmail) Expect(err).ToNot(HaveOccurred()) - authFile, err := ioutil.TempFile("", "") + authFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(authFile.Name(), []byte(serviceAccountKey), 0600) + err = os.WriteFile(authFile.Name(), []byte(serviceAccountKey), 0600) Expect(err).ToNot(HaveOccurred()) Expect(authFile.Close()).ToNot(HaveOccurred()) runCommand("gcloud", "auth", "activate-service-account", clientEmail.Email, "--key-file", authFile.Name()) @@ -69,7 +68,7 @@ var _ = Describe("download-product command", func() { uploadGCSFile(pivotalFile, serviceAccountKey, bucketName, "some/product/[pivnet-example-slug,1.10.1]example-product.pivotal") uploadGCSFile(pivotalFile, serviceAccountKey, bucketName, "another/stemcell/[stemcells-ubuntu-xenial,97.57]light-bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "example-product.pivotal", @@ -96,7 +95,7 @@ var _ = Describe("download-product command", func() { Expect(err).ToNot(HaveOccurred()) By("ensuring an assign stemcell artifact is created") - contents, err := ioutil.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) + contents, err := os.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) Expect(err).ToNot(HaveOccurred()) Expect(string(contents)).To(MatchYAML(`{product: example-product, stemcell: "97.57"}`)) @@ -129,7 +128,7 @@ var _ = Describe("download-product command", func() { When("the bucket does not exist", func() { It("gives a helpful error message", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -155,7 +154,7 @@ var _ = Describe("download-product command", func() { When("no files exist in the bucket", func() { // The bucket we get from the before each is already empty, so, no setup It("raises an error saying that no automation-downloaded files were found", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -187,7 +186,7 @@ var _ = Describe("download-product command", func() { }) It("raises an error that no files with a prefixed name matching the slug and version are available", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -216,7 +215,7 @@ var _ = Describe("download-product command", func() { }) It("outputs the file and downloaded file metadata", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -252,7 +251,7 @@ var _ = Describe("download-product command", func() { }) It("raises an error that too many files match the glob", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -279,7 +278,7 @@ var _ = Describe("download-product command", func() { }) It("raises an error that too many files match the glob", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", diff --git a/acceptance/download_product_pivnet_test.go b/acceptance/download_product_pivnet_test.go index 9ccd8754e..98d7a5069 100644 --- a/acceptance/download_product_pivnet_test.go +++ b/acceptance/download_product_pivnet_test.go @@ -6,7 +6,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "net/http" "os" "os/exec" @@ -30,7 +29,7 @@ var _ = Describe("download-product command", func() { BeforeEach(func() { pivotalFile := createPivotalFile("[pivnet-product,1.10.1]example*pivotal", "./fixtures/example-product.yml") - pivotalContents, err := ioutil.ReadFile(pivotalFile) + pivotalContents, err := os.ReadFile(pivotalFile) Expect(err).ToNot(HaveOccurred()) modTime := time.Now() @@ -195,7 +194,7 @@ var _ = Describe("download-product command", func() { }) It("downloads the product", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--pivnet-api-token", "token", @@ -236,7 +235,7 @@ var _ = Describe("download-product command", func() { ghttp.RespondWith(http.StatusOK, `{"info":{"version":"2.4.0"}}`), ) - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "-k", @@ -268,20 +267,20 @@ var _ = Describe("download-product command", func() { func fileContents(paths ...string) []byte { path := filepath.Join(paths...) - contents, err := ioutil.ReadFile(filepath.Join(path)) + contents, err := os.ReadFile(filepath.Join(path)) Expect(err).ToNot(HaveOccurred()) return contents } func createPivotalFile(productFileName, metadataFilename string) string { - tempfile, err := ioutil.TempFile("", productFileName) + tempfile, err := os.CreateTemp("", productFileName) Expect(err).ToNot(HaveOccurred()) zipper := zip.NewWriter(tempfile) file, err := zipper.Create("metadata/props.yml") Expect(err).ToNot(HaveOccurred()) - contents, err := ioutil.ReadFile(metadataFilename) + contents, err := os.ReadFile(metadataFilename) Expect(err).ToNot(HaveOccurred()) _, err = file.Write(contents) diff --git a/acceptance/download_product_s3_test.go b/acceptance/download_product_s3_test.go index b9ca03858..43c0b0abc 100644 --- a/acceptance/download_product_s3_test.go +++ b/acceptance/download_product_s3_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -45,7 +44,7 @@ var _ = Describe("download-product command", func() { runCommand("mc", "cp", pivotalFile, "testing/"+bucketName+"/some/product/[pivnet-example-slug,1.10.1]example-product.pivotal") runCommand("mc", "cp", pivotalFile, "testing/"+bucketName+"/another/stemcell/[stemcells-ubuntu-xenial,97.57]light-bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "example-product.pivotal", @@ -76,13 +75,13 @@ var _ = Describe("download-product command", func() { Expect(filepath.Join(tmpDir, "[stemcells-ubuntu-xenial,97.57]light-bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz.partial")).ToNot(BeAnExistingFile()) By("ensuring an assign stemcell artifact is created") - contents, err := ioutil.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) + contents, err := os.ReadFile(filepath.Join(tmpDir, "assign-stemcell.yml")) Expect(err).ToNot(HaveOccurred()) Expect(string(contents)).To(MatchYAML(`{product: example-product, stemcell: "97.57"}`)) - err = ioutil.WriteFile(filepath.Join(tmpDir, "[pivnet-example-slug,1.10.0]example-product.pivotal"), nil, 0777) + err = os.WriteFile(filepath.Join(tmpDir, "[pivnet-example-slug,1.10.0]example-product.pivotal"), nil, 0777) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(filepath.Join(tmpDir, "example-product.pivotal"), nil, 0777) + err = os.WriteFile(filepath.Join(tmpDir, "example-product.pivotal"), nil, 0777) Expect(err).ToNot(HaveOccurred()) By("running the command again, it uses the cache") @@ -126,7 +125,7 @@ var _ = Describe("download-product command", func() { runCommand("mc", "cp", pivotalFile, "testing/"+bucketName+"/some/product/[pivnet-example-slug,1.10.1]example-product.pivotal") runCommand("mc", "cp", pivotalFile, "testing/"+bucketName+"/another/stemcell/[stemcells-ubuntu-xenial,97.57]bosh-stemcell-97.57-google-kvm-ubuntu-xenial-go_agent.tgz") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--output-directory", tmpDir, @@ -159,7 +158,7 @@ stemcell-heavy: true`)) When("the bucket does not exist", func() { It("gives a helpful error message", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -185,7 +184,7 @@ stemcell-heavy: true`)) When("specifying the version of the AWS signature", func() { It("supports v2 signing", func() { runCommand("mc", "cp", "fixtures/product.yml", "testing/"+bucketName+"/[example-product,1.10.1]product.yml") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -209,7 +208,7 @@ stemcell-heavy: true`)) It("supports v4 signing", func() { runCommand("mc", "cp", "fixtures/product.yml", "testing/"+bucketName+"/[example-product,1.10.1]product.yml") - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -234,7 +233,7 @@ stemcell-heavy: true`)) When("no files exist in the bucket", func() { // The bucket we get from the before each is already empty, so, no setup It("raises an error saying that no automation-downloaded files were found", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -265,7 +264,7 @@ stemcell-heavy: true`)) }) It("raises an error that no files with a prefixed name matching the slug and version are available", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -294,7 +293,7 @@ stemcell-heavy: true`)) }) It("outputs the file and downloaded file metadata", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -332,7 +331,7 @@ stemcell-heavy: true`)) }) It("raises an error that too many files match the glob", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", @@ -361,7 +360,7 @@ stemcell-heavy: true`)) }) It("raises an error that too many files match the glob", func() { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, "download-product", "--file-glob", "*.yml", diff --git a/acceptance/export_installation_test.go b/acceptance/export_installation_test.go index 120cf8990..231616e42 100644 --- a/acceptance/export_installation_test.go +++ b/acceptance/export_installation_test.go @@ -1,8 +1,8 @@ package acceptance import ( - "io/ioutil" "net/http" + "os" "os/exec" "time" @@ -21,7 +21,7 @@ var _ = Describe("export-installation command", func() { ) BeforeEach(func() { - tempFile, err := ioutil.TempFile("", "") + tempFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) outputFileName = tempFile.Name() @@ -61,7 +61,7 @@ var _ = Describe("export-installation command", func() { Expect(session.Err).To(gbytes.Say("exporting installation")) Expect(session.Err).To(gbytes.Say("finished exporting installation")) - content, err := ioutil.ReadFile(outputFileName) + content, err := os.ReadFile(outputFileName) Expect(err).ToNot(HaveOccurred()) Expect(content).To(Equal([]byte("some-installation"))) }) diff --git a/acceptance/global_env_file_test.go b/acceptance/global_env_file_test.go index 307da9041..9560efa62 100644 --- a/acceptance/global_env_file_test.go +++ b/acceptance/global_env_file_test.go @@ -4,7 +4,6 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "io/ioutil" "os" "os/exec" "regexp" @@ -45,7 +44,7 @@ var _ = Describe("global env file", func() { createConfigFile := func(configContent string) { var err error - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configContent) diff --git a/acceptance/global_env_var_test.go b/acceptance/global_env_var_test.go index 86925ca8b..11445fef3 100644 --- a/acceptance/global_env_var_test.go +++ b/acceptance/global_env_var_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "net/http" "net/http/httptest" "net/http/httputil" @@ -87,7 +86,7 @@ connect-timeout: 10 server := testServer(true) - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(fmt.Sprintf(configContent, server.URL)) @@ -124,7 +123,7 @@ target: ((target)) username: ((username)) ` - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configContent) @@ -165,7 +164,7 @@ connect-timeout: 10 server := testServer(true) - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(fmt.Sprintf(configContent, server.URL)) diff --git a/acceptance/global_flag_test.go b/acceptance/global_flag_test.go index 6ed99ec03..c476a3411 100644 --- a/acceptance/global_flag_test.go +++ b/acceptance/global_flag_test.go @@ -3,7 +3,7 @@ package acceptance import ( "crypto/x509" "encoding/pem" - "io/ioutil" + "os" "os/exec" "github.com/onsi/gomega/gexec" @@ -123,10 +123,10 @@ var _ = Describe("global flags", func() { }) func writeFile(contents string) string { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(file.Name(), []byte(contents), 0777) + err = os.WriteFile(file.Name(), []byte(contents), 0777) Expect(err).ToNot(HaveOccurred()) return file.Name() } diff --git a/acceptance/import_installation_test.go b/acceptance/import_installation_test.go index c1a1d6a77..870ba45d9 100644 --- a/acceptance/import_installation_test.go +++ b/acceptance/import_installation_test.go @@ -2,7 +2,6 @@ package acceptance import ( "archive/zip" - "io/ioutil" "net/http" "os" "os/exec" @@ -26,7 +25,7 @@ var _ = Describe("import-installation command", func() { ) createZipFile := func(files []struct{ Name, Body string }) *os.File { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") w := zip.NewWriter(tmpFile) Expect(err).ToNot(HaveOccurred()) diff --git a/acceptance/init_test.go b/acceptance/init_test.go index d15ce3534..e2a52a7c5 100644 --- a/acceptance/init_test.go +++ b/acceptance/init_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -30,7 +29,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { minioPath, _ := exec.LookPath("minio") if minioPath != "" { - dataDir, err := ioutil.TempDir("", "") + dataDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command("minio", "server", "--config-dir", dataDir, "--address", ":9001", dataDir) command.Env = []string{ diff --git a/acceptance/interpolate_test.go b/acceptance/interpolate_test.go index 4dba9953e..76df7b652 100644 --- a/acceptance/interpolate_test.go +++ b/acceptance/interpolate_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "os" "os/exec" "strings" @@ -16,7 +15,7 @@ import ( var _ = Describe("interpolate command", func() { When("given a valid YAML file", func() { createFile := func(contents string) *os.File { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = file.WriteString(contents) Expect(err).ToNot(HaveOccurred()) diff --git a/acceptance/product_metadata_test.go b/acceptance/product_metadata_test.go index abb4fcaaa..9117482e9 100644 --- a/acceptance/product_metadata_test.go +++ b/acceptance/product_metadata_test.go @@ -4,7 +4,6 @@ import ( "archive/zip" "bytes" "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -24,7 +23,7 @@ var _ = Describe("product-metadata command", func() { BeforeEach(func() { var err error - productFile, err = ioutil.TempFile("", "fake-tile") + productFile, err = os.CreateTemp("", "fake-tile") Expect(err).ToNot(HaveOccurred()) z := zip.NewWriter(productFile) @@ -83,7 +82,7 @@ product_version: 1.2.3 When("there is only one .pivotal file for the product version", func() { BeforeEach(func() { pivotalFile := createPivotalFile("[example-product,1.10.1]example*pivotal", "./fixtures/example-product.yml") - contents, err := ioutil.ReadFile(pivotalFile) + contents, err := os.ReadFile(pivotalFile) Expect(err).ToNot(HaveOccurred()) modTime := time.Now() @@ -165,7 +164,7 @@ product_version: 1.2.3 When("there is more than one .pivotal file for a product version", func() { BeforeEach(func() { pivotalFile := createPivotalFile("[example-product,1.10.1]example*pivotal", "./fixtures/example-product.yml") - contents, err := ioutil.ReadFile(pivotalFile) + contents, err := os.ReadFile(pivotalFile) Expect(err).ToNot(HaveOccurred()) modTime := time.Now() diff --git a/acceptance/trace_test.go b/acceptance/trace_test.go index f3130b4d6..0879566c3 100644 --- a/acceptance/trace_test.go +++ b/acceptance/trace_test.go @@ -3,7 +3,6 @@ package acceptance import ( "archive/zip" "io" - "io/ioutil" "net/http" "os" "os/exec" @@ -32,7 +31,7 @@ var _ = Describe("global trace flag", func() { BeforeEach(func() { var err error - productFile, err = ioutil.TempFile("", "cool_name.com") + productFile, err = os.CreateTemp("", "cool_name.com") Expect(err).ToNot(HaveOccurred()) stat, err := productFile.Stat() @@ -43,7 +42,7 @@ var _ = Describe("global trace flag", func() { productWriter, err := zipper.CreateHeader(&zip.FileHeader{ Name: "./metadata/some-product.yml", UncompressedSize64: uint64(stat.Size()), - ModifiedTime: uint16(stat.ModTime().Unix()), + Modified: stat.ModTime(), }) Expect(err).ToNot(HaveOccurred()) diff --git a/acceptance/upload_product_test.go b/acceptance/upload_product_test.go index 5e7bd9a66..27d867862 100644 --- a/acceptance/upload_product_test.go +++ b/acceptance/upload_product_test.go @@ -3,7 +3,6 @@ package acceptance import ( "archive/zip" "io" - "io/ioutil" "net/http" "os" "os/exec" @@ -24,7 +23,7 @@ var _ = Describe("upload-product command", func() { BeforeEach(func() { var err error - productFile, err = ioutil.TempFile("", "cool_name.com") + productFile, err = os.CreateTemp("", "cool_name.com") Expect(err).ToNot(HaveOccurred()) stat, err := productFile.Stat() @@ -35,7 +34,7 @@ var _ = Describe("upload-product command", func() { productWriter, err := zipper.CreateHeader(&zip.FileHeader{ Name: "./metadata/some-product.yml", UncompressedSize64: uint64(stat.Size()), - ModifiedTime: uint16(stat.ModTime().Unix()), + Modified: stat.ModTime(), }) Expect(err).ToNot(HaveOccurred()) @@ -126,7 +125,7 @@ name: some-product`) BeforeEach(func() { var err error - emptyContent, err = ioutil.TempFile("", "") + emptyContent, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) }) diff --git a/acceptance/upload_stemcell_test.go b/acceptance/upload_stemcell_test.go index d80ffd938..f09ac50e4 100644 --- a/acceptance/upload_stemcell_test.go +++ b/acceptance/upload_stemcell_test.go @@ -2,7 +2,6 @@ package acceptance import ( "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -25,14 +24,14 @@ var _ = Describe("upload-stemcell command", func() { ) createStemcell := func(filename string) (string, string) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(filepath.Join(dir, "stemcells"), 0777) Expect(err).ToNot(HaveOccurred()) path := filepath.Join(dir, "stemcells", filename) - err = ioutil.WriteFile(path, []byte("content so validation does not fail"), 0777) + err = os.WriteFile(path, []byte("content so validation does not fail"), 0777) Expect(err).ToNot(HaveOccurred()) return path, dir } @@ -247,7 +246,7 @@ var _ = Describe("upload-stemcell command", func() { }) When("the content to upload is empty", func() { It("returns an error", func() { - emptyContent, err := ioutil.TempFile("", "") + emptyContent, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exec.Command(pathToMain, diff --git a/api/bosh_environment_service.go b/api/bosh_environment_service.go index ed648288d..cea61801a 100644 --- a/api/bosh_environment_service.go +++ b/api/bosh_environment_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "strings" ) @@ -34,7 +34,7 @@ func (a Api) GetBoshEnvironment() (GetBoshEnvironmentOutput, error) { return GetBoshEnvironmentOutput{}, err } - respBody, err := ioutil.ReadAll(resp.Body) + respBody, err := io.ReadAll(resp.Body) if err != nil { return GetBoshEnvironmentOutput{}, err } diff --git a/api/certificates_service.go b/api/certificates_service.go index 8e07661d4..48a08b006 100644 --- a/api/certificates_service.go +++ b/api/certificates_service.go @@ -2,7 +2,7 @@ package api import ( "encoding/json" - "io/ioutil" + "io" ) type DomainsInput struct { @@ -25,7 +25,7 @@ func (a Api) GenerateCertificate(domains DomainsInput) (string, error) { return "", err } - respBody, err := ioutil.ReadAll(resp.Body) + respBody, err := io.ReadAll(resp.Body) if err != nil { return "", err } diff --git a/api/diagnostic_service.go b/api/diagnostic_service.go index 004c2bd18..87a06dfc1 100644 --- a/api/diagnostic_service.go +++ b/api/diagnostic_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" "net/http" ) @@ -58,7 +58,7 @@ func (a Api) GetDiagnosticReport() (DiagnosticReport, error) { } `json:"added_products"` } - reportBytes, err := ioutil.ReadAll(resp.Body) + reportBytes, err := io.ReadAll(resp.Body) if err != nil { log.Fatal(err) } diff --git a/api/diff_service.go b/api/diff_service.go index 61d2138e0..329170e08 100644 --- a/api/diff_service.go +++ b/api/diff_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" ) type DirectorDiff struct { @@ -47,7 +47,7 @@ func (a Api) DirectorDiff() (DirectorDiff, error) { return DirectorDiff{}, fmt.Errorf("could not retrieve director diff: %w", err) } - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return DirectorDiff{}, err } @@ -82,7 +82,7 @@ func (a Api) ProductDiff(productName string) (ProductDiff, error) { defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return ProductDiff{}, fmt.Errorf("could not read response body for product diff: %w", err) } diff --git a/api/director_service.go b/api/director_service.go index 426faa38d..c5b9b9c53 100644 --- a/api/director_service.go +++ b/api/director_service.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" yamlConverter "github.com/ghodss/yaml" @@ -239,7 +239,7 @@ func (a Api) addGUIDToExistingNetworks(networks Networks) (Networks, error) { return Networks{}, err } - existingNetworksJSON, err := ioutil.ReadAll(existingNetworksResponse.Body) + existingNetworksJSON, err := io.ReadAll(existingNetworksResponse.Body) if err != nil { return Networks{}, fmt.Errorf("unable to read existing network configuration") // un-test: %w", erred } @@ -293,7 +293,7 @@ func (a Api) UpdateStagedDirectorIAASConfigurations(iaasConfig IAASConfiguration } defer iaasGetResp.Body.Close() - existingIAASJSON, err := ioutil.ReadAll(iaasGetResp.Body) + existingIAASJSON, err := io.ReadAll(iaasGetResp.Body) if err != nil { return err } @@ -405,7 +405,7 @@ func (a Api) updateIAASConfigurationInDirectorProperties(iaasConfigurations []*I } defer resp.Body.Close() - existingIAASJSON, err := ioutil.ReadAll(resp.Body) + existingIAASJSON, err := io.ReadAll(resp.Body) if err != nil { return fmt.Errorf("could not read IAAS configuration: %s", err) } @@ -464,7 +464,7 @@ func (a Api) addGUIDToExistingAZs(azs AvailabilityZones) (AvailabilityZones, err return AvailabilityZones{}, fmt.Errorf("received unexpected status while fetching AZ configuration: %d", existingAzsResponse.StatusCode) } - existingAzsJSON, err := ioutil.ReadAll(existingAzsResponse.Body) + existingAzsJSON, err := io.ReadAll(existingAzsResponse.Body) if err != nil { return AvailabilityZones{}, fmt.Errorf("unable to read existing AZ configuration: %w", err) } diff --git a/api/disable_director_verifiers_service.go b/api/disable_director_verifiers_service.go index 19f1cb127..41d762434 100644 --- a/api/disable_director_verifiers_service.go +++ b/api/disable_director_verifiers_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" ) const listDirectorVerifiersEndpoint = "/api/v0/staged/director/verifiers/install_time" @@ -29,7 +29,7 @@ func (a Api) ListDirectorVerifiers() ([]Verifier, error) { return nil, err } - verifiersBytes, err := ioutil.ReadAll(resp.Body) + verifiersBytes, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/api/disable_product_verifiers_service.go b/api/disable_product_verifiers_service.go index 4f7141d83..1652167d7 100644 --- a/api/disable_product_verifiers_service.go +++ b/api/disable_product_verifiers_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" ) const listProductVerifiersEndpointTemplate = "/api/v0/staged/products/%s/verifiers/install_time" @@ -25,7 +25,7 @@ func (a Api) ListProductVerifiers(productName string) ([]Verifier, string, error return nil, "", err } - verifiersBytes, err := ioutil.ReadAll(resp.Body) + verifiersBytes, err := io.ReadAll(resp.Body) if err != nil { return nil, "", err } diff --git a/api/info_service_test.go b/api/info_service_test.go index bda6be410..cd1cb399a 100644 --- a/api/info_service_test.go +++ b/api/info_service_test.go @@ -2,7 +2,7 @@ package api_test import ( "errors" - "io/ioutil" + "io" "net/http" "strings" @@ -73,7 +73,7 @@ var _ = Describe("Info Service", func() { It("lists the info", func() { client.DoReturns(&http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(strings.NewReader(`{ "info": { "version": "v2.1-build.79" } }`)), + Body: io.NopCloser(strings.NewReader(`{ "info": { "version": "v2.1-build.79" } }`)), }, nil) info, err := service.Info() @@ -92,7 +92,7 @@ var _ = Describe("Info Service", func() { It("errors if the response is not valid", func() { client.DoReturns(&http.Response{ StatusCode: http.StatusNotFound, - Body: ioutil.NopCloser(strings.NewReader("")), + Body: io.NopCloser(strings.NewReader("")), }, nil) info, err := service.Info() Expect(err).To(HaveOccurred()) diff --git a/api/installation_asset_service_test.go b/api/installation_asset_service_test.go index 270868dd5..1e59654b6 100644 --- a/api/installation_asset_service_test.go +++ b/api/installation_asset_service_test.go @@ -1,7 +1,6 @@ package api_test import ( - "io/ioutil" "net/http" "os" "strings" @@ -46,7 +45,7 @@ var _ = Describe("InstallationAssetService", func() { BeforeEach(func() { var err error - outputFile, err = ioutil.TempFile("", "") + outputFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) }) @@ -67,7 +66,7 @@ var _ = Describe("InstallationAssetService", func() { Expect(err).ToNot(HaveOccurred()) By("writing the installation to a local file") - ins, err := ioutil.ReadFile(outputFile.Name()) + ins, err := os.ReadFile(outputFile.Name()) Expect(err).ToNot(HaveOccurred()) Expect(string(ins)).To(Equal("some-installation")) }) diff --git a/api/pending_changes_service.go b/api/pending_changes_service.go index 379125638..26579b5e9 100644 --- a/api/pending_changes_service.go +++ b/api/pending_changes_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" ) @@ -38,7 +38,7 @@ func (a Api) ListStagedPendingChanges() (PendingChangesOutput, error) { return PendingChangesOutput{}, err } - reportBytes, err := ioutil.ReadAll(resp.Body) + reportBytes, err := io.ReadAll(resp.Body) if err != nil { log.Fatal(err) } diff --git a/api/pre_deploy_check_service.go b/api/pre_deploy_check_service.go index 689a9b280..b8d2db5f4 100644 --- a/api/pre_deploy_check_service.go +++ b/api/pre_deploy_check_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" ) @@ -83,7 +83,7 @@ func (a Api) ListPendingDirectorChanges() (PendingDirectorChangesOutput, error) return PendingDirectorChangesOutput{}, err } - reportBytes, err := ioutil.ReadAll(resp.Body) + reportBytes, err := io.ReadAll(resp.Body) if err != nil { return PendingDirectorChangesOutput{}, err } diff --git a/api/setup_service.go b/api/setup_service.go index eee452b2f..96d99bc52 100644 --- a/api/setup_service.go +++ b/api/setup_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "strings" @@ -111,7 +111,7 @@ func (a Api) EnsureAvailability(input EnsureAvailabilityInput) (EnsureAvailabili } case http.StatusOK: - respBody, err := ioutil.ReadAll(response.Body) + respBody, err := io.ReadAll(response.Body) if err != nil { return EnsureAvailabilityOutput{}, err } diff --git a/api/staged_products_service.go b/api/staged_products_service.go index e07d69eef..34a94ecd7 100644 --- a/api/staged_products_service.go +++ b/api/staged_products_service.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" "strconv" "strings" @@ -485,7 +485,7 @@ func (a Api) GetStagedProductJobMaxInFlight(productGUID string) (ProductJobMaxIn } defer resp.Body.Close() - contents, err := ioutil.ReadAll(resp.Body) + contents, err := io.ReadAll(resp.Body) var payload map[string]interface{} err = json.Unmarshal(contents, &payload) diff --git a/api/staged_products_service_test.go b/api/staged_products_service_test.go index 7c7157965..28f58a694 100644 --- a/api/staged_products_service_test.go +++ b/api/staged_products_service_test.go @@ -682,7 +682,7 @@ valid options configurations include percentages ('50%'), counts ('2'), and 'def // if strings.Contains(req.URL.Path, "some-product-guid") { // resp = &http.Response{ // StatusCode: http.StatusOK, - // Body: ioutil.NopCloser(bytes.NewBufferString(`{ + // Body: io.NopCloser(bytes.NewBufferString(`{ // "syslog_configuration": { // "enabled": true, // "address": "example.com" @@ -692,7 +692,7 @@ valid options configurations include percentages ('50%'), counts ('2'), and 'def // } else if strings.Contains(req.URL.Path, "missing-syslog-config") { // resp = &http.Response{ // StatusCode: http.StatusUnprocessableEntity, - // Body: ioutil.NopCloser(bytes.NewBufferString(`{ + // Body: io.NopCloser(bytes.NewBufferString(`{ // "errors": { // "syslog": ["This product does not support the Ops Manager consistent syslog configuration feature. If the product supports custom syslog configuration, those properties can be set via the /api/v0/staged/products/:product_guid/properties endpoint."] // } @@ -701,12 +701,12 @@ valid options configurations include percentages ('50%'), counts ('2'), and 'def // } else if strings.Contains(req.URL.Path, "bad-response-code") { // resp = &http.Response{ // StatusCode: http.StatusBadRequest, - // Body: ioutil.NopCloser(bytes.NewBufferString("")), + // Body: io.NopCloser(bytes.NewBufferString("")), // } // } else { // resp = &http.Response{ // StatusCode: http.StatusOK, - // Body: ioutil.NopCloser(bytes.NewBufferString(`{ + // Body: io.NopCloser(bytes.NewBufferString(`{ // invalid-json // }`)), // } diff --git a/api/vm_extensions_service.go b/api/vm_extensions_service.go index 7551884d2..c48cd4bac 100644 --- a/api/vm_extensions_service.go +++ b/api/vm_extensions_service.go @@ -3,7 +3,7 @@ package api import ( "encoding/json" "fmt" - "io/ioutil" + "io" ) type VMExtensionResponse struct { @@ -50,7 +50,7 @@ func (a Api) ListStagedVMExtensions() ([]VMExtension, error) { return nil, err } - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/api/vm_types_service.go b/api/vm_types_service.go index fbb6bda0c..83e4bf4d4 100644 --- a/api/vm_types_service.go +++ b/api/vm_types_service.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" ) type CreateVMTypes struct { @@ -140,7 +140,7 @@ func (a Api) ListVMTypes() ([]VMType, error) { return nil, err } - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/commands/apply_changes_test.go b/commands/apply_changes_test.go index 13b64386f..02a3ec294 100644 --- a/commands/apply_changes_test.go +++ b/commands/apply_changes_test.go @@ -3,7 +3,6 @@ package commands_test import ( "errors" "fmt" - "io/ioutil" "log" "os" "regexp" @@ -336,7 +335,7 @@ var _ = Describe("ApplyChanges", func() { Context("given a valid config file", func() { BeforeEach(func() { - fh, err := ioutil.TempFile("", "") + fh, err := os.CreateTemp("", "") defer func() { _ = fh.Close() }() Expect(err).ToNot(HaveOccurred()) _, err = fh.WriteString(` @@ -449,7 +448,7 @@ errands: Context("given a invalid yaml file", func() { BeforeEach(func() { - fh, err := ioutil.TempFile("", "") + fh, err := os.CreateTemp("", "") defer func() { _ = fh.Close() }() Expect(err).ToNot(HaveOccurred()) _, err = fh.WriteString(` diff --git a/commands/bosh_environment_test.go b/commands/bosh_environment_test.go index 47c560529..8aa8bb967 100644 --- a/commands/bosh_environment_test.go +++ b/commands/bosh_environment_test.go @@ -2,7 +2,6 @@ package commands_test import ( "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -100,7 +99,7 @@ var _ = Describe("bosh-env", func() { BeforeEach(func() { err = os.Mkdir("./tmp", os.ModePerm) Expect(err).ToNot(HaveOccurred()) - f, err = ioutil.TempFile("./tmp", "opsmankey-*.pem") + f, err = os.CreateTemp("./tmp", "opsmankey-*.pem") Expect(err).ToNot(HaveOccurred()) keyFile, err = filepath.Abs(f.Name()) @@ -209,7 +208,7 @@ var _ = Describe("bosh-env", func() { err = os.RemoveAll("./tmp-all-env") Expect(err).ToNot(HaveOccurred()) }() - f, err := ioutil.TempFile("./tmp-all-env", "opsmankey-*.pem") + f, err := os.CreateTemp("./tmp-all-env", "opsmankey-*.pem") Expect(err).ToNot(HaveOccurred()) keyFile, err := filepath.Abs(f.Name()) @@ -259,7 +258,7 @@ var _ = Describe("bosh-env", func() { err = os.RemoveAll("./tmp-bosh-env") Expect(err).ToNot(HaveOccurred()) }() - f, err := ioutil.TempFile("./tmp-bosh-env", "opsmankey-*.pem") + f, err := os.CreateTemp("./tmp-bosh-env", "opsmankey-*.pem") Expect(err).ToNot(HaveOccurred()) keyFile, err := filepath.Abs(f.Name()) @@ -304,7 +303,7 @@ var _ = Describe("bosh-env", func() { err = os.RemoveAll("./tmp-credhub-env") Expect(err).ToNot(HaveOccurred()) }() - f, err := ioutil.TempFile("./tmp-credhub-env", "opsmankey-*.pem") + f, err := os.CreateTemp("./tmp-credhub-env", "opsmankey-*.pem") Expect(err).ToNot(HaveOccurred()) keyFile, err := filepath.Abs(f.Name()) diff --git a/commands/config_template_test.go b/commands/config_template_test.go index ec13c0f13..4a456c33c 100644 --- a/commands/config_template_test.go +++ b/commands/config_template_test.go @@ -2,7 +2,7 @@ package commands_test import ( "errors" - "io/ioutil" + "os" "path/filepath" . "github.com/onsi/ginkgo/v2" @@ -18,7 +18,7 @@ var _ = Describe("ConfigTemplate", func() { ) createOutputDirectory := func() string { - tempDir, err := ioutil.TempDir("", "") + tempDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) return tempDir @@ -236,7 +236,7 @@ property_blueprints: matches, err := filepath.Glob(filepath.Join(tempDir, "example-product", "1.1.1", "optional", "*.yml")) Expect(err).ToNot(HaveOccurred()) Expect(matches).To(HaveLen(1)) - contents, err := ioutil.ReadFile(matches[0]) + contents, err := os.ReadFile(matches[0]) Expect(err).ToNot(HaveOccurred()) Expect(string(contents)).To(MatchYAML(expectedContents)) }) diff --git a/commands/configure_director_test.go b/commands/configure_director_test.go index 08d3b542d..5a151cfc7 100644 --- a/commands/configure_director_test.go +++ b/commands/configure_director_test.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "log" "os" @@ -60,7 +59,7 @@ var _ = Describe("ConfigureDirector", func() { }) JustBeforeEach(func() { - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer configFile.Close() @@ -215,7 +214,7 @@ vmtypes-configuration: vmtypes-configuration: custom_only: true ` - newConfigFile, err := ioutil.TempFile("", "config.yml") + newConfigFile, err := os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer newConfigFile.Close() @@ -252,7 +251,7 @@ vmtypes-configuration: ram: 4096 ephemeral_disk: 20480 ` - newConfigFile, err := ioutil.TempFile("", "config.yml") + newConfigFile, err := os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer newConfigFile.Close() @@ -286,7 +285,7 @@ vmtypes-configuration: ram: 4096 ephemeral_disk: 20480 ` - newConfigFile, err := ioutil.TempFile("", "config.yml") + newConfigFile, err := os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer newConfigFile.Close() @@ -317,7 +316,7 @@ vmtypes-configuration: ram: 4096 ephemeral_disk: 20480 ` - newConfigFile, err := ioutil.TempFile("", "config.yml") + newConfigFile, err := os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer newConfigFile.Close() @@ -344,7 +343,7 @@ vmtypes-configuration: It("does not configure the director", func() { configYAML := `invalidYAML` - configFile, err := ioutil.TempFile("", "config.yaml") + configFile, err := os.CreateTemp("", "config.yaml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configYAML) Expect(err).ToNot(HaveOccurred()) diff --git a/commands/configure_opsman_test.go b/commands/configure_opsman_test.go index 7f9241f8e..4943836df 100644 --- a/commands/configure_opsman_test.go +++ b/commands/configure_opsman_test.go @@ -2,7 +2,7 @@ package commands_test import ( "errors" - "io/ioutil" + "io" "log" . "github.com/onsi/ginkgo/v2" @@ -21,7 +21,7 @@ var _ = Describe("ConfigureOpsman", func() { BeforeEach(func() { fakeService = &fakes.ConfigureOpsmanService{} - logger := log.New(ioutil.Discard, "", 0) + logger := log.New(io.Discard, "", 0) command = commands.NewConfigureOpsman(func() []string { return []string{} }, fakeService, logger) }) diff --git a/commands/configure_product_test.go b/commands/configure_product_test.go index 33db2241c..4cba0e858 100644 --- a/commands/configure_product_test.go +++ b/commands/configure_product_test.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "github.com/pivotal-cf/om/api" @@ -31,7 +30,7 @@ var _ = Describe("ConfigureProduct", func() { }) JustBeforeEach(func() { - configFile, err = ioutil.TempFile("", "config.yml") + configFile, err = os.CreateTemp("", "config.yml") Expect(err).ToNot(HaveOccurred()) defer configFile.Close() @@ -350,13 +349,13 @@ var _ = Describe("ConfigureProduct", func() { It("can interpolate variables into the configuration", func() { client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(productPropertiesWithVariableTemplate) Expect(err).ToNot(HaveOccurred()) - varsFile, err := ioutil.TempFile("", "") + varsFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = varsFile.WriteString(`password: something-secure`) @@ -374,7 +373,7 @@ var _ = Describe("ConfigureProduct", func() { It("can interpolate variables into the configuration", func() { client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(productPropertiesWithVariableTemplate) @@ -392,7 +391,7 @@ var _ = Describe("ConfigureProduct", func() { It("can interpolate variables into the configuration", func() { client := commands.NewConfigureProduct(func() []string { return []string{"OM_VAR_password=something-secure"} }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(productPropertiesWithVariableTemplate) @@ -411,7 +410,7 @@ var _ = Describe("ConfigureProduct", func() { client := commands.NewConfigureProduct(func() []string { return []string{"OM_VAR_password=something-secure"} }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(productPropertiesWithVariableTemplate) @@ -427,7 +426,7 @@ var _ = Describe("ConfigureProduct", func() { It("returns an error if missing variables", func() { client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(productPropertiesWithVariableTemplate) @@ -444,13 +443,13 @@ var _ = Describe("ConfigureProduct", func() { It("can interpolate ops-files into the configuration", func() { client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlProductProperties) Expect(err).ToNot(HaveOccurred()) - opsFile, err := ioutil.TempFile("", "") + opsFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = opsFile.WriteString(productOpsFile) @@ -471,13 +470,13 @@ var _ = Describe("ConfigureProduct", func() { It("returns an error if the ops file is invalid", func() { client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlProductProperties) Expect(err).ToNot(HaveOccurred()) - opsFile, err := ioutil.TempFile("", "") + opsFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = opsFile.WriteString(`%%%`) @@ -716,7 +715,7 @@ var _ = Describe("ConfigureProduct", func() { }, }, nil) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(invalidConfig) @@ -830,7 +829,7 @@ var _ = Describe("ConfigureProduct", func() { service.UpdateStagedProductErrandsReturns(errors.New("error configuring errand")) client := commands.NewConfigureProduct(func() []string { return nil }, service, "", logger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(errandConfigFile) @@ -846,7 +845,7 @@ var _ = Describe("ConfigureProduct", func() { Context("with unrecognized top-level-keys", func() { It("returns error saying the specified key", func() { configYAML := `{"product-name": "cf", "unrecognized-other-key": {}, "unrecognized-key": {"some-attr1": "some-val1"}}` - configFile, err := ioutil.TempFile("", "config.yaml") + configFile, err := os.CreateTemp("", "config.yaml") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configYAML) Expect(err).ToNot(HaveOccurred()) diff --git a/commands/create_vm_extension_test.go b/commands/create_vm_extension_test.go index 62164b1a6..cb6a70693 100644 --- a/commands/create_vm_extension_test.go +++ b/commands/create_vm_extension_test.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" . "github.com/onsi/ginkgo/v2" @@ -76,10 +75,10 @@ var _ = Describe("CreateVMExtension", func() { When("using a config file", func() { Context("with a vars file", func() { It("makes a request to the OpsMan to create a VM extension", func() { - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - varsFile, err = ioutil.TempFile("", "") + varsFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlVMExtensionFile) @@ -108,10 +107,10 @@ var _ = Describe("CreateVMExtension", func() { Context("with a var defined", func() { It("makes a request to the OpsMan to create a VM extension", func() { - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - varsFile, err = ioutil.TempFile("", "") + varsFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlVMExtensionFile) @@ -141,7 +140,7 @@ var _ = Describe("CreateVMExtension", func() { func() []string { return []string{"OM_VAR_vm_extension_name=some-vm-extension"} }, fakeService, fakeLogger) - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlVMExtensionFile) @@ -185,7 +184,7 @@ var _ = Describe("CreateVMExtension", func() { Expect(fakeService.CreateStagedVMExtensionCallCount()).Should(Equal(0)) }) It("returns an error when name not in file", func() { - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlVMExtensionNoNameFile) @@ -203,7 +202,7 @@ var _ = Describe("CreateVMExtension", func() { Context("fails to interpolate config file", func() { It("returns an error", func() { - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(ymlVMExtensionFile) @@ -220,7 +219,7 @@ var _ = Describe("CreateVMExtension", func() { Context("bad yaml in config file", func() { It("returns an error", func() { - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString("asdfasdf") diff --git a/commands/curl.go b/commands/curl.go index 98a6adb85..b2dfd1037 100644 --- a/commands/curl.go +++ b/commands/curl.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "os" "strings" @@ -89,7 +88,7 @@ func (c Curl) Execute(args []string) error { c.stderr.Printf(headers.String()) } - body, err := ioutil.ReadAll(output.Body) + body, err := io.ReadAll(output.Body) if err != nil { return fmt.Errorf("failed to read api response body: %s", err) } diff --git a/commands/curl_test.go b/commands/curl_test.go index bb291a257..36dea81df 100644 --- a/commands/curl_test.go +++ b/commands/curl_test.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "os" "strings" @@ -25,7 +24,7 @@ func (er errReader) Read([]byte) (int, error) { var _ = Describe("Curl", func() { stringCloser := func(s string) io.ReadCloser { - return ioutil.NopCloser(strings.NewReader(s)) + return io.NopCloser(strings.NewReader(s)) } Describe("Execute", func() { var ( @@ -65,7 +64,7 @@ var _ = Describe("Curl", func() { Expect(input.Method).To(Equal("POST")) Expect(input.Headers).To(HaveKeyWithValue("Content-Type", []string{"application/json"})) - data, err := ioutil.ReadAll(input.Data) + data, err := io.ReadAll(input.Data) Expect(err).ToNot(HaveOccurred()) Expect(string(data)).To(Equal(`{"some-key": "some-value"}`)) content := stdout.PrintlnArgsForCall(0) @@ -212,7 +211,7 @@ var _ = Describe("Curl", func() { }) It("reads request data from a file when --data is prefixed with @", func() { - f, err := ioutil.TempFile("", "om-curl-*") + f, err := os.CreateTemp("", "om-curl-*") Expect(err).ToNot(HaveOccurred()) defer os.Remove(f.Name()) @@ -326,7 +325,7 @@ var _ = Describe("Curl", func() { When("the response body cannot be read", func() { It("returns an error", func() { fakeService.CurlReturns(api.RequestServiceCurlOutput{ - Body: ioutil.NopCloser(errReader{}), + Body: io.NopCloser(errReader{}), }, nil) err := executeCommand(command, []string{ "--path", "/api/v0/some/path", diff --git a/commands/download_product.go b/commands/download_product.go index 995332860..75117f2a4 100644 --- a/commands/download_product.go +++ b/commands/download_product.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "path" @@ -514,7 +513,7 @@ func (c *DownloadProduct) downloadProductFile(slug, version, glob, prefixPath st func (c *DownloadProduct) cleanupCacheArtifacts(outputDir string, glob string, productFilePath string, slug string) error { if c.Options.CacheCleanup == "I acknowledge this will delete files in the output directories" { - outputDirContents, err := ioutil.ReadDir(outputDir) + outputDirContents, err := os.ReadDir(outputDir) if err != nil { return err } diff --git a/commands/download_product_test.go b/commands/download_product_test.go index 25f1dcf63..1837150bd 100644 --- a/commands/download_product_test.go +++ b/commands/download_product_test.go @@ -4,7 +4,6 @@ import ( "archive/zip" "errors" "fmt" - "io/ioutil" "log" "os" "path" @@ -58,7 +57,7 @@ var _ = Describe("DownloadProduct", func() { }) It("downloads a product from the downloader", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -74,7 +73,7 @@ var _ = Describe("DownloadProduct", func() { }) It("supports the pivnet-file-glob alias for file-glob", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -102,7 +101,7 @@ var _ = Describe("DownloadProduct", func() { }) It("downloads the highest version matching that regex", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -139,7 +138,7 @@ var _ = Describe("DownloadProduct", func() { }) It("ignores the version and prints a warning", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -166,7 +165,7 @@ var _ = Describe("DownloadProduct", func() { }) It("returns an error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -192,12 +191,12 @@ var _ = Describe("DownloadProduct", func() { fakeProductDownloader.GetLatestProductFileReturnsOnCall(0, fa, nil) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { - return ioutil.WriteFile(file.Name(), []byte("contents"), 0777) + return os.WriteFile(file.Name(), []byte("contents"), 0777) } }) It("downloads a product from the downloader", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -222,12 +221,12 @@ var _ = Describe("DownloadProduct", func() { fakeProductDownloader.GetLatestProductFileReturnsOnCall(0, fa, nil) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { - return ioutil.WriteFile(file.Name(), []byte("contents"), 0777) + return os.WriteFile(file.Name(), []byte("contents"), 0777) } }) It("errors and removes the file from the file system", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -264,7 +263,7 @@ var _ = Describe("DownloadProduct", func() { }) It("grabs the latest stemcell for the product that matches the glob", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { @@ -294,7 +293,7 @@ var _ = Describe("DownloadProduct", func() { Expect(pf.Name()).To(Equal(filepath.Join(tempDir, "stemcell.tgz.partial"))) fileName := path.Join(tempDir, "download-file.json") - fileContent, err := ioutil.ReadFile(fileName) + fileContent, err := os.ReadFile(fileName) Expect(err).ToNot(HaveOccurred()) Expect(fileName).To(BeAnExistingFile()) downloadedFilePath := path.Join(tempDir, "cf-2.0-build.1.pivotal") @@ -309,7 +308,7 @@ var _ = Describe("DownloadProduct", func() { }`, downloadedFilePath, downloadedStemcellFilePath))) fileName = path.Join(tempDir, "assign-stemcell.yml") - fileContent, err = ioutil.ReadFile(fileName) + fileContent, err = os.ReadFile(fileName) Expect(err).ToNot(HaveOccurred()) Expect(fileName).To(BeAnExistingFile()) Expect(string(fileContent)).To(MatchJSON(` @@ -321,7 +320,7 @@ var _ = Describe("DownloadProduct", func() { When("the --check-upload-already is specified", func() { It("does not download the stemcell and product", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -350,16 +349,16 @@ var _ = Describe("DownloadProduct", func() { ) tempFile := func(dir, pattern string) string { - file, err := ioutil.TempFile(dir, pattern) + file, err := os.CreateTemp(dir, pattern) Expect(err).ToNot(HaveOccurred()) return file.Name() } BeforeEach(func() { - productOutputDir, err = ioutil.TempDir("", "om-tests-output-dir-") + productOutputDir, err = os.MkdirTemp("", "om-tests-output-dir-") Expect(err).ToNot(HaveOccurred()) - stemcellOutputDir, err = ioutil.TempDir("", "om-tests-stemcell-output-dir-") + stemcellOutputDir, err = os.MkdirTemp("", "om-tests-stemcell-output-dir-") Expect(err).ToNot(HaveOccurred()) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { @@ -472,7 +471,7 @@ var _ = Describe("DownloadProduct", func() { When("the --stemcell-version flag is passed", func() { It("downloads the specified stemcell at that version", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { @@ -499,7 +498,7 @@ var _ = Describe("DownloadProduct", func() { Expect(pf.Name()).To(Equal(filepath.Join(tempDir, "[stemcells-ubuntu-xenial,100.00]stemcell.tgz.partial"))) fileName := path.Join(tempDir, "download-file.json") - fileContent, err := ioutil.ReadFile(fileName) + fileContent, err := os.ReadFile(fileName) Expect(err).ToNot(HaveOccurred()) Expect(fileName).To(BeAnExistingFile()) downloadedFilePath := path.Join(tempDir, "[elastic-runtime,2.0.0]cf-2.0-build.1.pivotal") @@ -514,7 +513,7 @@ var _ = Describe("DownloadProduct", func() { }`, downloadedFilePath, downloadedStemcellFilePath))) fileName = path.Join(tempDir, "assign-stemcell.yml") - fileContent, err = ioutil.ReadFile(fileName) + fileContent, err = os.ReadFile(fileName) Expect(err).ToNot(HaveOccurred()) Expect(fileName).To(BeAnExistingFile()) Expect(string(fileContent)).To(MatchJSON(` @@ -534,7 +533,7 @@ var _ = Describe("DownloadProduct", func() { }) It("prints a warning and returns available file artifacts", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -549,7 +548,7 @@ var _ = Describe("DownloadProduct", func() { Expect(err).ToNot(HaveOccurred()) downloadReportFileName := path.Join(tempDir, "download-file.json") - fileContent, err := ioutil.ReadFile(downloadReportFileName) + fileContent, err := os.ReadFile(downloadReportFileName) Expect(err).ToNot(HaveOccurred()) Expect(downloadReportFileName).To(BeAnExistingFile()) downloadedFilePath := path.Join(tempDir, "cf-2.0-build.1.tgz") @@ -576,7 +575,7 @@ var _ = Describe("DownloadProduct", func() { sa.VersionReturns("97.190") fakeProductDownloader.GetLatestStemcellForProductReturns(sa, nil) - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) fakeProductDownloader.DownloadProductToFileStub = func(artifacter download_clients.FileArtifacter, file *os.File) error { @@ -618,7 +617,7 @@ var _ = Describe("DownloadProduct", func() { sa.VersionReturns("97.190") fakeProductDownloader.GetLatestStemcellForProductReturns(sa, nil) - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -659,7 +658,7 @@ var _ = Describe("DownloadProduct", func() { sa.VersionReturns("97.190") fakeProductDownloader.GetLatestStemcellForProductReturns(sa, nil) - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -680,7 +679,7 @@ var _ = Describe("DownloadProduct", func() { }) It("fails if --stemcell-heavy flag is provided but --stemcell-iaas is not", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -712,7 +711,7 @@ var _ = Describe("DownloadProduct", func() { sa.VersionReturns("97.190") fakeProductDownloader.GetLatestStemcellForProductReturns(sa, nil) - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -748,7 +747,7 @@ var _ = Describe("DownloadProduct", func() { }) It("does not download it", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -776,7 +775,7 @@ var _ = Describe("DownloadProduct", func() { }) It("download the file", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -808,7 +807,7 @@ var _ = Describe("DownloadProduct", func() { }) It("returns that error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -841,7 +840,7 @@ var _ = Describe("DownloadProduct", func() { }) It("does not download it", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -874,7 +873,7 @@ var _ = Describe("DownloadProduct", func() { }) It("does not download it", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -903,7 +902,7 @@ var _ = Describe("DownloadProduct", func() { }) It("download the file", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -937,7 +936,7 @@ var _ = Describe("DownloadProduct", func() { }) It("returns that error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) commandArgs := []string{ @@ -965,7 +964,7 @@ var _ = Describe("DownloadProduct", func() { var tempDir string BeforeEach(func() { - tempDir, err = ioutil.TempDir("", "om-tests-") + tempDir, err = os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) fa := &fakes.FileArtifacter{} @@ -1029,7 +1028,7 @@ var _ = Describe("DownloadProduct", func() { }) It("prefixes the filename with a bracketed slug and version", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1047,7 +1046,7 @@ var _ = Describe("DownloadProduct", func() { }) It("writes the prefixed filename to the download-file.json", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1061,7 +1060,7 @@ var _ = Describe("DownloadProduct", func() { Expect(err).ToNot(HaveOccurred()) downloadReportFileName := path.Join(tempDir, "download-file.json") - fileContent, err := ioutil.ReadFile(downloadReportFileName) + fileContent, err := os.ReadFile(downloadReportFileName) Expect(err).ToNot(HaveOccurred()) Expect(downloadReportFileName).To(BeAnExistingFile()) prefixedFileName := path.Join(tempDir, "[mayhem-crew,2.0.0]my-great-product.pivotal") @@ -1076,7 +1075,7 @@ var _ = Describe("DownloadProduct", func() { fakeProductDownloader.GetLatestProductFileReturns(fa, nil) }) It("doesn't prefix", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1093,7 +1092,7 @@ var _ = Describe("DownloadProduct", func() { }) It("writes the unprefixed filename to the download-file.json", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1106,7 +1105,7 @@ var _ = Describe("DownloadProduct", func() { Expect(err).ToNot(HaveOccurred()) downloadReportFileName := path.Join(tempDir, "download-file.json") - fileContent, err := ioutil.ReadFile(downloadReportFileName) + fileContent, err := os.ReadFile(downloadReportFileName) Expect(err).ToNot(HaveOccurred()) Expect(downloadReportFileName).To(BeAnExistingFile()) unPrefixedFileName := path.Join(tempDir, "my-great-product.pivotal") @@ -1118,7 +1117,7 @@ var _ = Describe("DownloadProduct", func() { When("--stemcell-version flag is provided, but --stemcell-iaas is missing", func() { It("returns an error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1143,7 +1142,7 @@ var _ = Describe("DownloadProduct", func() { BeforeEach(func() { nonexistingDir = "/invalid/dir/noexist" - validDirectory, err = ioutil.TempDir("", "") + validDirectory, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) @@ -1186,10 +1185,10 @@ var _ = Describe("DownloadProduct", func() { ) BeforeEach(func() { - existingNonDirFile, err = ioutil.TempFile("", "") + existingNonDirFile, err = os.CreateTemp("", "") Expect(err).NotTo(HaveOccurred()) - validDirectory, err = ioutil.TempDir("", "") + validDirectory, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) @@ -1230,7 +1229,7 @@ var _ = Describe("DownloadProduct", func() { When("pivnet-api-token is missing while no source is set", func() { It("returns an error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1245,7 +1244,7 @@ var _ = Describe("DownloadProduct", func() { When("both product-version and product-version-regex are set", func() { It("fails with an error saying that the user must pick one or the other", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1262,7 +1261,7 @@ var _ = Describe("DownloadProduct", func() { When("neither product-version nor product-version-regex are set", func() { It("fails with an error saying that the user must provide one or the other", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ @@ -1281,7 +1280,7 @@ var _ = Describe("DownloadProduct", func() { }) It("returns an error", func() { - tempDir, err := ioutil.TempDir("", "om-tests-") + tempDir, err := os.MkdirTemp("", "om-tests-") Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ diff --git a/commands/import_installation_test.go b/commands/import_installation_test.go index 573284aa3..a004c1994 100644 --- a/commands/import_installation_test.go +++ b/commands/import_installation_test.go @@ -5,7 +5,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "io" "os" "strings" "time" @@ -28,7 +28,7 @@ var _ = Describe("ImportInstallation", func() { ) createZipFile := func(files []struct{ Name, Body string }) string { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") w := zip.NewWriter(tmpFile) Expect(err).ToNot(HaveOccurred()) @@ -58,12 +58,14 @@ var _ = Describe("ImportInstallation", func() { }) AfterEach(func() { - os.Remove(installationFile) + if err := os.Remove(installationFile); err != nil { + fmt.Printf("Error during cleanup: %v\n", err) + } }) It("imports an installation", func() { submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -102,7 +104,7 @@ var _ = Describe("ImportInstallation", func() { Expect(fakeService.UploadInstallationAssetCollectionArgsForCall(0)).To(Equal(api.ImportInstallationInput{ ContentLength: 10, - Installation: ioutil.NopCloser(strings.NewReader("")), + Installation: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", })) @@ -144,7 +146,7 @@ var _ = Describe("ImportInstallation", func() { BeforeEach(func() { submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -218,7 +220,7 @@ var _ = Describe("ImportInstallation", func() { BeforeEach(func() { submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -306,13 +308,15 @@ var _ = Describe("ImportInstallation", func() { When("the --installation provided is not a valid zip file", func() { var notZipFile string BeforeEach(func() { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) notZipFile = tmpFile.Name() }) AfterEach(func() { - os.Remove(notZipFile) + if err := os.Remove(installationFile); err != nil { + fmt.Printf("Error during cleanup: %v\n", err) + } }) It("returns an error", func() { @@ -329,7 +333,9 @@ var _ = Describe("ImportInstallation", func() { }) AfterEach(func() { - os.Remove(invalidInstallation) + if err := os.Remove(installationFile); err != nil { + fmt.Printf("Error during cleanup: %v\n", err) + } }) It("returns an error", func() { diff --git a/commands/init_test.go b/commands/init_test.go index 439186c05..7de76fa2e 100644 --- a/commands/init_test.go +++ b/commands/init_test.go @@ -5,7 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "io/ioutil" "os" "regexp" "strings" @@ -18,10 +17,10 @@ func TestCommands(t *testing.T) { } func writeTestConfigFile(contents string) string { - file, err := ioutil.TempFile("", "config-*.yml") + file, err := os.CreateTemp("", "config-*.yml") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(file.Name(), []byte(contents), 0777) + err = os.WriteFile(file.Name(), []byte(contents), 0777) Expect(err).ToNot(HaveOccurred()) return file.Name() } diff --git a/commands/interpolate.go b/commands/interpolate.go index 9f9e48518..5db03fa04 100644 --- a/commands/interpolate.go +++ b/commands/interpolate.go @@ -3,7 +3,7 @@ package commands import ( "errors" "fmt" - "io/ioutil" + "io" "log" "os" @@ -58,12 +58,12 @@ func (c Interpolate) Execute(args []string) error { // Bitwise AND uses stdin's file mode mask against the unix character device to // determine if it's pointing to stdin's pipe if info.Mode()&os.ModeCharDevice == 0 && (len(c.Options.ConfigFile) == 0 || c.Options.ConfigFile == "-") { - contents, err := ioutil.ReadAll(c.input) + contents, err := io.ReadAll(c.input) if err != nil { return fmt.Errorf("error reading STDIN: %s", err) } - tempFile, err := ioutil.TempFile("", "yml") + tempFile, err := os.CreateTemp("", "yml") if err != nil { return fmt.Errorf("error generating temp file for STDIN: %s", err) } diff --git a/commands/interpolate_test.go b/commands/interpolate_test.go index a025f331f..578a13ec0 100644 --- a/commands/interpolate_test.go +++ b/commands/interpolate_test.go @@ -1,7 +1,6 @@ package commands_test import ( - "io/ioutil" "os" . "github.com/onsi/ginkgo/v2" @@ -34,9 +33,9 @@ var _ = Describe("Interpolate", func() { BeforeEach(func() { var err error - stdin, err = ioutil.TempFile("", "") + stdin, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(stdin.Name(), []byte(templateNoParametersOverStdin), os.ModeCharDevice|0755) // mimic a character device so it'll be picked up in the conditional + err = os.WriteFile(stdin.Name(), []byte(templateNoParametersOverStdin), os.ModeCharDevice|0755) // mimic a character device so it'll be picked up in the conditional Expect(err).ToNot(HaveOccurred()) logger = &fakes.Logger{} command = commands.NewInterpolate(func() []string { return nil }, logger, stdin) @@ -56,22 +55,22 @@ var _ = Describe("Interpolate", func() { ) BeforeEach(func() { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) inputFile = tmpFile.Name() - tmpFile, err = ioutil.TempFile("", "") + tmpFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) varsFile = tmpFile.Name() - tmpFile, err = ioutil.TempFile("", "") + tmpFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) varsFile2 = tmpFile.Name() - tmpFile, err = ioutil.TempFile("", "") + tmpFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) opsFile = tmpFile.Name() @@ -90,7 +89,7 @@ var _ = Describe("Interpolate", func() { Context("no vars or ops file inputs", func() { It("succeeds", func() { - err := ioutil.WriteFile(inputFile, []byte(templateNoParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateNoParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -102,7 +101,7 @@ var _ = Describe("Interpolate", func() { }) It("fails when all parameters are not specified", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -114,9 +113,9 @@ var _ = Describe("Interpolate", func() { Context("with vars file input", func() { It("succeeds", func() { - err := ioutil.WriteFile(inputFile, []byte(templateNoParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateNoParameters), 0755) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(varsFile, []byte(varsFileParameter), 0755) + err = os.WriteFile(varsFile, []byte(varsFileParameter), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -129,11 +128,11 @@ var _ = Describe("Interpolate", func() { }) It("succeeds when multiple vars files", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithParameters), 0755) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(varsFile, []byte(varsFileParameter), 0755) + err = os.WriteFile(varsFile, []byte(varsFileParameter), 0755) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(varsFile2, []byte(varsFileParameter2), 0755) + err = os.WriteFile(varsFile2, []byte(varsFileParameter2), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -149,7 +148,7 @@ var _ = Describe("Interpolate", func() { Context("with vars input", func() { It("succeeds", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -162,7 +161,7 @@ var _ = Describe("Interpolate", func() { }) It("succeeds with multiple vars inputs", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithMultipleParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithMultipleParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -176,7 +175,7 @@ var _ = Describe("Interpolate", func() { }) It("takes the last value if there are duplicate vars", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithMultipleParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithMultipleParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -193,9 +192,9 @@ var _ = Describe("Interpolate", func() { Context("with ops file input", func() { It("succeeds", func() { - err := ioutil.WriteFile(inputFile, []byte(templateNoParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateNoParameters), 0755) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(opsFile, []byte(opsFileParameter), 0755) + err = os.WriteFile(opsFile, []byte(opsFileParameter), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -211,9 +210,9 @@ hello: world`)) When("path flag is set", func() { It("returns a value from the interpolated file", func() { - err := ioutil.WriteFile(inputFile, []byte(`{"a": "((interpolated-value))", "c":"d" }`), 0755) + err := os.WriteFile(inputFile, []byte(`{"a": "((interpolated-value))", "c":"d" }`), 0755) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(varsFile, []byte(`{"interpolated-value": "b"}`), 0755) + err = os.WriteFile(varsFile, []byte(`{"interpolated-value": "b"}`), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -230,7 +229,7 @@ hello: world`)) When("the skip-missing flag is set", func() { When("there are missing parameters", func() { It("succeeds", func() { - err := ioutil.WriteFile(inputFile, []byte(templateWithParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateWithParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, @@ -281,7 +280,7 @@ hello: world`)) When("the config is passed via stdin and a config file", func() { It("uses the config file", func() { - err := ioutil.WriteFile(inputFile, []byte(templateNoParameters), 0755) + err := os.WriteFile(inputFile, []byte(templateNoParameters), 0755) Expect(err).ToNot(HaveOccurred()) err = executeCommand(command, []string{ "--config", inputFile, diff --git a/commands/stage_product.go b/commands/stage_product.go index d33a6da8d..54a522b36 100644 --- a/commands/stage_product.go +++ b/commands/stage_product.go @@ -2,9 +2,11 @@ package commands import ( "fmt" - "github.com/pivotal-cf/om/api" + "os" + "gopkg.in/yaml.v2" - "io/ioutil" + + "github.com/pivotal-cf/om/api" ) type StageProduct struct { @@ -107,7 +109,7 @@ func (sp StageProduct) Execute(args []string) error { func (sp *StageProduct) loadConfig() error { if sp.Options.ConfigFile != "" { - contents, err := ioutil.ReadFile(sp.Options.ConfigFile) + contents, err := os.ReadFile(sp.Options.ConfigFile) if err != nil { return err } diff --git a/commands/upload_product_test.go b/commands/upload_product_test.go index 38ca0a556..598ea4b75 100644 --- a/commands/upload_product_test.go +++ b/commands/upload_product_test.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "regexp" @@ -41,7 +40,7 @@ var _ = Describe("UploadProduct", func() { It("uploads a product", func() { submission := formcontent.ContentSubmission{ ContentLength: 10, - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", } multipart.FinalizeReturns(submission) @@ -58,7 +57,7 @@ var _ = Describe("UploadProduct", func() { Expect(file).To(Equal("/path/to/some-product.tgz")) Expect(fakeService.UploadAvailableProductArgsForCall(0)).To(Equal(api.UploadAvailableProductInput{ ContentLength: 10, - Product: ioutil.NopCloser(strings.NewReader("")), + Product: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", PollingInterval: 1, })) @@ -115,7 +114,7 @@ var _ = Describe("UploadProduct", func() { When("the --shasum flag is defined", func() { It("proceeds normally when the sha sums match", func() { - file, err := ioutil.TempFile("", "test-file.yaml") + file, err := os.CreateTemp("", "test-file.yaml") Expect(err).ToNot(HaveOccurred()) defer os.Remove(file.Name()) @@ -149,7 +148,7 @@ var _ = Describe("UploadProduct", func() { }) It("returns an error when the sha sums don't match", func() { - file, err := ioutil.TempFile("", "test-file.yaml") + file, err := os.CreateTemp("", "test-file.yaml") Expect(err).ToNot(HaveOccurred()) defer os.Remove(file.Name()) @@ -180,7 +179,7 @@ var _ = Describe("UploadProduct", func() { When("the --product-version flag is defined", func() { It("proceeds normally when the versions match", func() { - file, err := ioutil.TempFile("", "test-file.yaml") + file, err := os.CreateTemp("", "test-file.yaml") Expect(err).ToNot(HaveOccurred()) err = file.Close() Expect(err).ToNot(HaveOccurred()) @@ -211,7 +210,7 @@ var _ = Describe("UploadProduct", func() { }) It("returns an error when the versions don't match", func() { - file, err := ioutil.TempFile("", "test-file.yaml") + file, err := os.CreateTemp("", "test-file.yaml") Expect(err).ToNot(HaveOccurred()) err = file.Close() Expect(err).ToNot(HaveOccurred()) diff --git a/commands/upload_stemcell_test.go b/commands/upload_stemcell_test.go index b189185f0..348313035 100644 --- a/commands/upload_stemcell_test.go +++ b/commands/upload_stemcell_test.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "strings" @@ -74,7 +73,7 @@ var _ = Describe("UploadStemcell", func() { It("to all compatible products", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -99,7 +98,7 @@ var _ = Describe("UploadStemcell", func() { Expect(fakeService.UploadStemcellArgsForCall(0)).To(Equal(api.StemcellUploadInput{ ContentLength: 10, - Stemcell: ioutil.NopCloser(strings.NewReader("")), + Stemcell: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", })) @@ -121,7 +120,7 @@ var _ = Describe("UploadStemcell", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) submission := formcontent.ContentSubmission{ ContentLength: 10, - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", } multipart.FinalizeReturns(submission) @@ -148,7 +147,7 @@ var _ = Describe("UploadStemcell", func() { Expect(fakeService.UploadStemcellArgsForCall(0)).To(Equal(api.StemcellUploadInput{ ContentLength: 10, - Stemcell: ioutil.NopCloser(strings.NewReader("")), + Stemcell: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", })) @@ -189,7 +188,7 @@ var _ = Describe("UploadStemcell", func() { It("tries again", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -219,7 +218,7 @@ var _ = Describe("UploadStemcell", func() { It("returns an error", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -250,7 +249,7 @@ var _ = Describe("UploadStemcell", func() { It("exits successfully without uploading", func() { submission := formcontent.ContentSubmission{ ContentLength: 10, - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", } multipart.FinalizeReturns(submission) @@ -271,7 +270,7 @@ var _ = Describe("UploadStemcell", func() { Context("and force is specified", func() { It("uploads the stemcell", func() { submission := formcontent.ContentSubmission{ - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", ContentLength: 10, } @@ -292,7 +291,7 @@ var _ = Describe("UploadStemcell", func() { Expect(file).To(Equal("/path/to/stemcell.tgz")) Expect(fakeService.UploadStemcellArgsForCall(0)).To(Equal(api.StemcellUploadInput{ ContentLength: 10, - Stemcell: ioutil.NopCloser(strings.NewReader("")), + Stemcell: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", })) @@ -310,7 +309,7 @@ var _ = Describe("UploadStemcell", func() { When("the --shasum flag is defined", func() { It("proceeds normally when the sha sums match", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) - file, err := ioutil.TempFile("", "test-file.tgz") + file, err := os.CreateTemp("", "test-file.tgz") Expect(err).ToNot(HaveOccurred()) defer os.Remove(file.Name()) @@ -321,7 +320,7 @@ var _ = Describe("UploadStemcell", func() { submission := formcontent.ContentSubmission{ ContentLength: 10, - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", } multipart.FinalizeReturns(submission) @@ -338,7 +337,7 @@ var _ = Describe("UploadStemcell", func() { Expect(fmt.Sprintf(format, v...)).To(ContainSubstring("expected shasum matches stemcell shasum.")) }) It("returns an error when the sha sums don't match", func() { - file, err := ioutil.TempFile("", "test-file.tgz") + file, err := os.CreateTemp("", "test-file.tgz") Expect(err).ToNot(HaveOccurred()) defer os.Remove(file.Name()) @@ -371,7 +370,7 @@ var _ = Describe("UploadStemcell", func() { fakeService.InfoReturns(api.Info{Version: "2.2-build.1"}, nil) submission := formcontent.ContentSubmission{ ContentLength: 10, - Content: ioutil.NopCloser(strings.NewReader("")), + Content: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", } multipart.FinalizeReturns(submission) @@ -390,7 +389,7 @@ var _ = Describe("UploadStemcell", func() { Expect(file).To(Equal("/path/to/stemcell.tgz")) Expect(fakeService.UploadStemcellArgsForCall(0)).To(Equal(api.StemcellUploadInput{ ContentLength: 10, - Stemcell: ioutil.NopCloser(strings.NewReader("")), + Stemcell: io.NopCloser(strings.NewReader("")), ContentType: "some content-type", })) diff --git a/configtemplate/generator/execute.go b/configtemplate/generator/execute.go index a40d2f1b5..13bf857fb 100644 --- a/configtemplate/generator/execute.go +++ b/configtemplate/generator/execute.go @@ -3,7 +3,6 @@ package generator import ( "errors" "fmt" - "io/ioutil" "os" "path" @@ -207,8 +206,8 @@ func (e *Executor) writeYamlFile(targetFile string, dataType interface{}) error if err != nil { return err } - return ioutil.WriteFile(targetFile, data, 0755) + return os.WriteFile(targetFile, data, 0755) } else { - return ioutil.WriteFile(targetFile, nil, 0755) + return os.WriteFile(targetFile, nil, 0755) } } diff --git a/configtemplate/generator/execute_test.go b/configtemplate/generator/execute_test.go index 44e16830f..472db0b1d 100644 --- a/configtemplate/generator/execute_test.go +++ b/configtemplate/generator/execute_test.go @@ -2,7 +2,6 @@ package generator_test import ( "fmt" - "io/ioutil" "os" "path" "path/filepath" @@ -72,7 +71,7 @@ var _ = Describe("Executor", func() { Context("Generate", func() { var ( - pwd, _ = ioutil.TempDir("", "") + pwd, _ = os.MkdirTemp("", "") testGen = path.Join(pwd, "_testGen") tmpPath = path.Join(testGen, "templates") ) @@ -207,12 +206,12 @@ func listFilesInDirectory(productPath string) []string { } func getFileBytes(metadataFile string) ([]byte, error) { - return ioutil.ReadFile(metadataFile) + return os.ReadFile(metadataFile) } func unmarshalProduct(targetFile string) (*Template, error) { template := &Template{} - yamlFile, err := ioutil.ReadFile(targetFile) + yamlFile, err := os.ReadFile(targetFile) if err != nil { return nil, err } diff --git a/configtemplate/generator/integration/product_properties_test.go b/configtemplate/generator/integration/product_properties_test.go index c87c86aee..40e122a8f 100644 --- a/configtemplate/generator/integration/product_properties_test.go +++ b/configtemplate/generator/integration/product_properties_test.go @@ -1,9 +1,10 @@ package integration_test import ( - "io/ioutil" + "os" . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "gopkg.in/yaml.v2" @@ -11,7 +12,7 @@ import ( ) func getMetadata(filename string) *generator.Metadata { - fileData, err := ioutil.ReadFile(filename) + fileData, err := os.ReadFile(filename) Expect(err).ToNot(HaveOccurred()) metadata, err := generator.NewMetadata(fileData) Expect(err).ToNot(HaveOccurred()) @@ -22,7 +23,7 @@ var _ = Describe("Product PropertyInputs", func() { Context("GetAllProductProperties", func() { It("Should return new required product properties for healthwatch", func() { metadata := getMetadata("../fixtures/metadata/p_healthwatch.yml") - expected, err := ioutil.ReadFile("../fixtures/vars/healthwatch-product.yml") + expected, err := os.ReadFile("../fixtures/vars/healthwatch-product.yml") Expect(err).ToNot(HaveOccurred()) productProperties, err := generator.GetAllProductProperties(metadata) Expect(err).ToNot(HaveOccurred()) @@ -34,7 +35,7 @@ var _ = Describe("Product PropertyInputs", func() { It("Should return new required product properties for pas", func() { metadata := getMetadata("../fixtures/metadata/pas.yml") - expected, err := ioutil.ReadFile("../fixtures/vars/pas-required.yml") + expected, err := os.ReadFile("../fixtures/vars/pas-required.yml") Expect(err).ToNot(HaveOccurred()) productProperties, err := generator.GetAllProductProperties(metadata) Expect(err).ToNot(HaveOccurred()) @@ -48,7 +49,7 @@ var _ = Describe("Product PropertyInputs", func() { Context("GetDefaultVars", func() { It("Should return default variables for properties", func() { metadata := getMetadata("../fixtures/metadata/p_healthwatch.yml") - expected, err := ioutil.ReadFile("../fixtures/vars/healthwatch-default-vars.yml") + expected, err := os.ReadFile("../fixtures/vars/healthwatch-default-vars.yml") Expect(err).ToNot(HaveOccurred()) requiredVars, err := generator.GetDefaultPropertyVars(metadata) Expect(err).ToNot(HaveOccurred()) diff --git a/configtemplate/generator/metadata_test.go b/configtemplate/generator/metadata_test.go index c5cceae37..b8ab5a9a0 100644 --- a/configtemplate/generator/metadata_test.go +++ b/configtemplate/generator/metadata_test.go @@ -1,7 +1,7 @@ package generator_test import ( - "io/ioutil" + "os" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,7 +10,7 @@ import ( ) func getMetadata(filename string) *generator.Metadata { - fileData, err := ioutil.ReadFile(filename) + fileData, err := os.ReadFile(filename) Expect(err).ToNot(HaveOccurred()) metadata, err := generator.NewMetadata(fileData) Expect(err).ToNot(HaveOccurred()) diff --git a/depstability/dependency_stability_test.go b/depstability/dependency_stability_test.go index 1cd463121..7234214f3 100644 --- a/depstability/dependency_stability_test.go +++ b/depstability/dependency_stability_test.go @@ -1,7 +1,7 @@ package depstability_test import ( - "io/ioutil" + "os" "strings" . "github.com/onsi/ginkgo/v2" @@ -20,7 +20,7 @@ var _ = Describe("Dependency Topology", func() { }) func listDepnamesFromGoSum() (deplist []string, err error) { - gosum, err := ioutil.ReadFile("../go.sum") + gosum, err := os.ReadFile("../go.sum") if err != nil { return } @@ -40,7 +40,7 @@ func listDepnamesFromGoSum() (deplist []string, err error) { } func listDepnamesFromRecords() (deplist []string, err error) { - depRecords, err := ioutil.ReadFile("records/depnames-7.13.0.txt") + depRecords, err := os.ReadFile("records/depnames-7.13.0.txt") trimmedDepRecords := strings.TrimSpace(string(depRecords)) deplist = strings.Split(trimmedDepRecords, "\n") return diff --git a/docsgenerator/generator/generate.go b/docsgenerator/generator/generate.go index f4194b7f8..1401b53bc 100644 --- a/docsgenerator/generator/generate.go +++ b/docsgenerator/generator/generate.go @@ -3,7 +3,6 @@ package generator import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "sort" @@ -327,7 +326,7 @@ func (g *Generator) cleanupExtraDirs(baseDir string, commandDescriptions map[str } func getFileContents(filepath string) (string, error) { - contents, err := ioutil.ReadFile(filepath) + contents, err := os.ReadFile(filepath) if err != nil { return "", err } diff --git a/docsgenerator/generator/generator_test.go b/docsgenerator/generator/generator_test.go index 3eff953df..e0263818d 100644 --- a/docsgenerator/generator/generator_test.go +++ b/docsgenerator/generator/generator_test.go @@ -3,7 +3,6 @@ package generator_test import ( "errors" "fmt" - "io/ioutil" "os" "path/filepath" "sort" @@ -26,10 +25,10 @@ var _ = Describe("Generator", func() { var err error ex = &fakes.Executor{} - templatesDir, err = ioutil.TempDir("", "") + templatesDir, err = os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) - docsDir, err = ioutil.TempDir("", "") + docsDir, err = os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) }) @@ -87,7 +86,7 @@ var _ = Describe("Generator", func() { err := gen.GenerateDocs() Expect(err).ToNot(HaveOccurred()) - docsFolders, err := ioutil.ReadDir(docsDir) + docsFolders, err := os.ReadDir(docsDir) Expect(err).ToNot(HaveOccurred()) var docsFolderNames []string @@ -149,7 +148,7 @@ var _ = Describe("Generator", func() { err := gen.GenerateDocs() Expect(err).ToNot(HaveOccurred()) - readmeContent, err := ioutil.ReadFile(filepath.Join(docsDir, generator.ReadmeFileName)) + readmeContent, err := os.ReadFile(filepath.Join(docsDir, generator.ReadmeFileName)) Expect(err).ToNot(HaveOccurred()) Expect(string(readmeContent)).To(Equal(fmt.Sprintf( @@ -197,7 +196,7 @@ var _ = Describe("Generator", func() { err := gen.GenerateDocs() Expect(err).ToNot(HaveOccurred()) - docsFolders, err := ioutil.ReadDir(docsDir) + docsFolders, err := os.ReadDir(docsDir) Expect(err).ToNot(HaveOccurred()) var docsFolderNames []string @@ -268,7 +267,7 @@ var _ = Describe("Generator", func() { err = gen.GenerateDocs() Expect(err).ToNot(HaveOccurred()) - commandFolders, err := ioutil.ReadDir(templatesDir) + commandFolders, err := os.ReadDir(templatesDir) Expect(err).ToNot(HaveOccurred()) var commandFolderNames []string @@ -318,7 +317,7 @@ var _ = Describe("Generator", func() { err = gen.GenerateDocs() Expect(err).ToNot(HaveOccurred()) - commandFolders, err := ioutil.ReadDir(docsDir) + commandFolders, err := os.ReadDir(docsDir) Expect(err).ToNot(HaveOccurred()) var commandFolderNames []string @@ -414,7 +413,7 @@ var _ = Describe("Generator", func() { func checkCommandReadmeContent(containingDir string, additional bool) { commandName := filepath.Base(containingDir) - readmeContent, err := ioutil.ReadFile(filepath.Join(containingDir, generator.ReadmeFileName)) + readmeContent, err := os.ReadFile(filepath.Join(containingDir, generator.ReadmeFileName)) Expect(err).ToNot(HaveOccurred()) additionalText := "" @@ -435,27 +434,27 @@ func checkCommandReadmeContent(containingDir string, additional bool) { func checkTemplateFiles(containingDir string) { commandName := filepath.Base(containingDir) - descriptionContents, err := ioutil.ReadFile(filepath.Join(containingDir, generator.DescriptionFileName)) + descriptionContents, err := os.ReadFile(filepath.Join(containingDir, generator.DescriptionFileName)) Expect(err).ToNot(HaveOccurred()) Expect(string(descriptionContents)).To(Equal(fmt.Sprintf(generator.DescriptionTemplate, commandName))) - additionalInfoContents, err := ioutil.ReadFile(filepath.Join(containingDir, generator.AdditionalInfoFileName)) + additionalInfoContents, err := os.ReadFile(filepath.Join(containingDir, generator.AdditionalInfoFileName)) Expect(err).ToNot(HaveOccurred()) Expect(string(additionalInfoContents)).To(Equal(fmt.Sprintf(generator.AdditionalInfoTemplate, commandName))) } func checkReadmeTemplateFiles(containingDir string) { - descriptionContents, err := ioutil.ReadFile(filepath.Join(containingDir, generator.ReadmeBeforeFileName)) + descriptionContents, err := os.ReadFile(filepath.Join(containingDir, generator.ReadmeBeforeFileName)) Expect(err).ToNot(HaveOccurred()) Expect(string(descriptionContents)).To(Equal(generator.ReadmeBeforeTemplate)) - additionalInfoContents, err := ioutil.ReadFile(filepath.Join(containingDir, generator.ReadmeAfterFileName)) + additionalInfoContents, err := os.ReadFile(filepath.Join(containingDir, generator.ReadmeAfterFileName)) Expect(err).ToNot(HaveOccurred()) Expect(string(additionalInfoContents)).To(Equal(generator.ReadmeAfterTemplate)) } func checkFileDoesNotContain(filePath string, lines ...string) { - content, err := ioutil.ReadFile(filePath) + content, err := os.ReadFile(filePath) Expect(err).ToNot(HaveOccurred()) for _, line := range lines { @@ -464,7 +463,7 @@ func checkFileDoesNotContain(filePath string, lines ...string) { } func checkFileEquals(filePath string, expected string) { - content, err := ioutil.ReadFile(filePath) + content, err := os.ReadFile(filePath) Expect(err).ToNot(HaveOccurred()) Expect(string(content)).To(Equal(expected)) diff --git a/docstest/docs_test.go b/docstest/docs_test.go index 4cc57ba1b..75f970dcd 100644 --- a/docstest/docs_test.go +++ b/docstest/docs_test.go @@ -2,7 +2,6 @@ package docs_test import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -50,7 +49,7 @@ func readFile(docName string) (docContents string) { docPath, err := filepath.Abs(docName) Expect(err).ToNot(HaveOccurred()) - docContentsBytes, err := ioutil.ReadFile(docPath) + docContentsBytes, err := os.ReadFile(docPath) docContents = string(docContentsBytes) Expect(err).ToNot(HaveOccurred()) diff --git a/download_clients/pivnet_client_test.go b/download_clients/pivnet_client_test.go index 62d9721ab..f10938509 100644 --- a/download_clients/pivnet_client_test.go +++ b/download_clients/pivnet_client_test.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" "log" "net/http" + "os" "time" "github.com/onsi/gomega/ghttp" @@ -28,7 +28,7 @@ var _ = Describe("Grabbing Metadata", func() { modTime := time.Now() productFile := createPivotalFile("some.pivotal", "", "") - contents, err := ioutil.ReadFile(productFile) + contents, err := os.ReadFile(productFile) Expect(err).NotTo(HaveOccurred()) server := ghttp.NewTLSServer() @@ -264,7 +264,7 @@ var _ = Describe("PivnetClient", func() { It("downloads a product file to given destination", func() { fakePivnetDownloader.DownloadProductFileReturns(nil) - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) client := download_clients.NewPivnetClient(stdout, stderr, fakePivnetFactory, "", true, "") @@ -274,7 +274,7 @@ var _ = Describe("PivnetClient", func() { It("returns an error if the product file could not be downloaded", func() { fakePivnetDownloader.DownloadProductFileReturns(errors.New("download error")) - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) client := download_clients.NewPivnetClient(stdout, stderr, fakePivnetFactory, "", true, "") diff --git a/download_clients/s3_client_test.go b/download_clients/s3_client_test.go index 4d1c31a4b..2c3da23e8 100644 --- a/download_clients/s3_client_test.go +++ b/download_clients/s3_client_test.go @@ -4,9 +4,9 @@ import ( "archive/zip" "errors" "io" - "io/ioutil" "log" "net/url" + "os" "strings" "text/template" @@ -273,7 +273,7 @@ func (m mockItem) Open() (io.ReadCloser, error) { return nil, m.fileError } - return ioutil.NopCloser(strings.NewReader("hello world")), nil + return io.NopCloser(strings.NewReader("hello world")), nil } func (m mockItem) ID() string { @@ -285,14 +285,14 @@ func (m mockItem) Size() (int64, error) { } func createPivotalFile(productFileName, stemcellName, stemcellVersion string) string { - tempfile, err := ioutil.TempFile("", productFileName) + tempfile, err := os.CreateTemp("", productFileName) Expect(err).ToNot(HaveOccurred()) zipper := zip.NewWriter(tempfile) file, err := zipper.Create("metadata/props.yml") Expect(err).ToNot(HaveOccurred()) - contents, err := ioutil.ReadFile("./fixtures/example-product-metadata.yml") + contents, err := os.ReadFile("./fixtures/example-product-metadata.yml") Expect(err).ToNot(HaveOccurred()) context := struct { diff --git a/download_clients/stow_client_test.go b/download_clients/stow_client_test.go index 72aceb708..376ce3e0e 100644 --- a/download_clients/stow_client_test.go +++ b/download_clients/stow_client_test.go @@ -3,7 +3,6 @@ package download_clients_test import ( "errors" "fmt" - "io/ioutil" "log" "os" @@ -215,7 +214,7 @@ var _ = Describe("stowClient", func() { BeforeEach(func() { var err error - file, err = ioutil.TempFile("", "") + file, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = file.WriteString(fileContents) @@ -240,13 +239,13 @@ var _ = Describe("stowClient", func() { client := download_clients.NewStowClient(stower, stderr, stow.ConfigMap{"endpoint": "endpoint"}, "", "", "", "bucket") - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) err = client.DownloadProductToFile(createPivnetFileArtifact(), file) Expect(err).ToNot(HaveOccurred()) - contents, err := ioutil.ReadFile(file.Name()) + contents, err := os.ReadFile(file.Name()) Expect(err).ToNot(HaveOccurred()) Expect(contents).To(Equal([]byte(fileContents))) }) @@ -259,7 +258,7 @@ var _ = Describe("stowClient", func() { location: location, } - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) client := download_clients.NewStowClient(stower, nil, stow.ConfigMap{"endpoint": "endpoint"}, "", "", "", "bucket") diff --git a/extractor/from_file.go b/extractor/from_file.go index 929457570..ee00cf13b 100644 --- a/extractor/from_file.go +++ b/extractor/from_file.go @@ -4,9 +4,10 @@ import ( "archive/zip" "errors" "fmt" - "gopkg.in/yaml.v2" - "io/ioutil" + "io" "regexp" + + "gopkg.in/yaml.v2" ) var metadataRegexp = regexp.MustCompile(`^(\.\/)?metadata/.*\.yml`) @@ -45,7 +46,7 @@ func captureMetadata(file *zip.File) (*Metadata, error) { return nil, err } - contents, err := ioutil.ReadAll(metadataFile) + contents, err := io.ReadAll(metadataFile) if err != nil { return nil, err } diff --git a/extractor/metadata_extractor_test.go b/extractor/metadata_extractor_test.go index b9f808267..b7aa9c7b4 100644 --- a/extractor/metadata_extractor_test.go +++ b/extractor/metadata_extractor_test.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "os" "time" @@ -35,7 +34,7 @@ stemcell_criteria: func createProductFile(metadataFilePath, contents string) *os.File { var err error - productFile, err := ioutil.TempFile("", "") + productFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) stat, err := productFile.Stat() @@ -79,7 +78,7 @@ var _ = Describe("MetadataExtractor", func() { server := ghttp.NewServer() modTime := time.Now() - contents, err := ioutil.ReadFile(productFilename) + contents, err := os.ReadFile(productFilename) Expect(err).ToNot(HaveOccurred()) server.AppendHandlers( diff --git a/formcontent/formcontent_test.go b/formcontent/formcontent_test.go index 1ba9c5410..d51df0c89 100644 --- a/formcontent/formcontent_test.go +++ b/formcontent/formcontent_test.go @@ -1,13 +1,13 @@ package formcontent_test import ( + "io" + "os" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pivotal-cf/om/formcontent" - - "io/ioutil" - "os" ) var _ = Describe("Formcontent", func() { @@ -17,7 +17,7 @@ var _ = Describe("Formcontent", func() { var fileWithContent string BeforeEach(func() { - handle, err := ioutil.TempFile("", "") + handle, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = handle.WriteString("some content") @@ -35,7 +35,7 @@ var _ = Describe("Formcontent", func() { Expect(submission.ContentLength).ToNot(BeZero()) // drain the reader to force pipe to be closed - _, err = ioutil.ReadAll(submission.Content) + _, err = io.ReadAll(submission.Content) Expect(err).ToNot(HaveOccurred()) }) @@ -53,7 +53,7 @@ var _ = Describe("Formcontent", func() { submission := form.Finalize() Expect(submission.ContentLength).ToNot(BeZero()) - contents, err := ioutil.ReadAll(submission.Content) + contents, err := io.ReadAll(submission.Content) Expect(err).ToNot(HaveOccurred()) Expect(contents).To(ContainSubstring("other-file")) Expect(contents).ToNot(ContainSubstring("original-file")) @@ -67,7 +67,7 @@ var _ = Describe("Formcontent", func() { ) BeforeEach(func() { - handle1, err := ioutil.TempFile("", "") + handle1, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = handle1.WriteString("some content") @@ -75,7 +75,7 @@ var _ = Describe("Formcontent", func() { fileWithContent1 = handle1.Name() - handle2, err := ioutil.TempFile("", "") + handle2, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = handle2.WriteString("some more content") @@ -100,7 +100,7 @@ var _ = Describe("Formcontent", func() { submission := form.Finalize() - content, err := ioutil.ReadAll(submission.Content) + content, err := io.ReadAll(submission.Content) Expect(err).ToNot(HaveOccurred()) Expect(string(content)).To(MatchRegexp(`^--\w+\r\nContent-Disposition: form-data; name=\"something\[file1\]\"; filename=\"\w+\"\r\n` + @@ -114,7 +114,7 @@ var _ = Describe("Formcontent", func() { When("the file provided is empty", func() { It("returns an error", func() { - emptyFile, err := ioutil.TempFile("", "") + emptyFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) form := formcontent.NewForm() @@ -150,7 +150,7 @@ var _ = Describe("Formcontent", func() { submission := form.Finalize() - content, err := ioutil.ReadAll(submission.Content) + content, err := io.ReadAll(submission.Content) Expect(err).ToNot(HaveOccurred()) Expect(string(content)).To(MatchRegexp(`^--\w+\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1` + @@ -165,7 +165,7 @@ var _ = Describe("Formcontent", func() { BeforeEach(func() { var err error - handle1, err := ioutil.TempFile("", "") + handle1, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = handle1.WriteString("some content") @@ -189,7 +189,7 @@ var _ = Describe("Formcontent", func() { submission := form.Finalize() - content, err := ioutil.ReadAll(submission.Content) + content, err := io.ReadAll(submission.Content) Expect(err).ToNot(HaveOccurred()) Expect(submission.ContentLength).To(Or(Equal(int64(373)), Equal(int64(374)))) diff --git a/interpolate/execute.go b/interpolate/execute.go index e2d6bc357..6df2e3490 100644 --- a/interpolate/execute.go +++ b/interpolate/execute.go @@ -2,7 +2,7 @@ package interpolate import ( "fmt" - "io/ioutil" + "os" "strings" "github.com/cloudfoundry/bosh-cli/director/template" @@ -22,7 +22,7 @@ type Options struct { } func Execute(o Options) ([]byte, error) { - contents, err := ioutil.ReadFile(o.TemplateFile) + contents, err := os.ReadFile(o.TemplateFile) if err != nil { return nil, fmt.Errorf("could not read file (%s): %s", o.TemplateFile, err.Error()) } @@ -138,7 +138,7 @@ func maintainMultilineString(v string, new interface{}) interface{} { } func readYAMLFile(path string, dataType interface{}) error { - payload, err := ioutil.ReadFile(path) + payload, err := os.ReadFile(path) if err != nil { return fmt.Errorf("could not read file (%s): %s", path, err.Error()) } diff --git a/interpolate/interpolate_suite_test.go b/interpolate/interpolate_suite_test.go index 4e00b4778..8a3c8a0ac 100644 --- a/interpolate/interpolate_suite_test.go +++ b/interpolate/interpolate_suite_test.go @@ -1,7 +1,7 @@ package interpolate_test import ( - "io/ioutil" + "os" "testing" "github.com/pivotal-cf/om/interpolate" @@ -271,10 +271,10 @@ other-template-keys: }) func writeFile(contents string) string { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(file.Name(), []byte(contents), 0777) + err = os.WriteFile(file.Name(), []byte(contents), 0777) Expect(err).ToNot(HaveOccurred()) return file.Name() } diff --git a/network/decrypt_client.go b/network/decrypt_client.go index 95a8d5e12..1327a94fb 100644 --- a/network/decrypt_client.go +++ b/network/decrypt_client.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "math/rand" "net" "net/http" @@ -177,7 +176,7 @@ func (c DecryptClient) checkAvailability() error { } case http.StatusOK: - respBody, err := ioutil.ReadAll(response.Body) + respBody, err := io.ReadAll(response.Body) if err != nil { return NonRetryableError(err) } diff --git a/network/decrypt_client_test.go b/network/decrypt_client_test.go index fba3e49a4..2e95ca23a 100644 --- a/network/decrypt_client_test.go +++ b/network/decrypt_client_test.go @@ -2,7 +2,7 @@ package network_test import ( "errors" - "io/ioutil" + "io" "net" "net/http" "strings" @@ -31,12 +31,12 @@ var _ = Describe("DecryptClient", func() { fakeClient.DoReturnsOnCall(index, &http.Response{ // /api/v0/unlock StatusCode: http.StatusOK, ContentLength: int64(len([]byte(`{}`))), - Body: ioutil.NopCloser(strings.NewReader(`{}`)), + Body: io.NopCloser(strings.NewReader(`{}`)), }, nil) fakeClient.DoReturnsOnCall(index+1, &http.Response{ // /api/v0/ensure_availability StatusCode: http.StatusOK, ContentLength: int64(len([]byte("Waiting for authentication system to start..."))), - Body: ioutil.NopCloser(strings.NewReader("Waiting for authentication system to start...")), + Body: io.NopCloser(strings.NewReader("Waiting for authentication system to start...")), }, nil) fakeClient.DoReturnsOnCall(index+2, &http.Response{ // /api/v0/ensure_availability StatusCode: http.StatusFound, @@ -46,7 +46,7 @@ var _ = Describe("DecryptClient", func() { }, }, ContentLength: int64(len([]byte("Waiting for authentication system to start..."))), - Body: ioutil.NopCloser(strings.NewReader("Waiting for authentication system to start...")), + Body: io.NopCloser(strings.NewReader("Waiting for authentication system to start...")), }, nil) fakeClient.DoReturnsOnCall(index+3, &http.Response{StatusCode: http.StatusOK}, nil) // actual request fakeClient.DoReturnsOnCall(index+4, &http.Response{StatusCode: http.StatusOK}, nil) // actual request @@ -125,7 +125,7 @@ var _ = Describe("DecryptClient", func() { fakeClient.DoReturnsOnCall(0, &http.Response{ // /api/v0/unlock StatusCode: http.StatusForbidden, ContentLength: int64(len([]byte(`{}`))), - Body: ioutil.NopCloser(strings.NewReader(`{}`)), + Body: io.NopCloser(strings.NewReader(`{}`)), }, nil) }) diff --git a/network/http_client.go b/network/http_client.go index 5c3765a37..8705fbde4 100644 --- a/network/http_client.go +++ b/network/http_client.go @@ -1,13 +1,14 @@ package network import ( + "context" "crypto/tls" "crypto/x509" "errors" "fmt" - "io/ioutil" "net" "net/http" + "os" "strings" "time" ) @@ -28,10 +29,13 @@ func newHTTPClient(insecureSkipVerify bool, caCert string, requestTimeout time.D Transport: &http.Transport{ Proxy: http.ProxyFromEnvironment, TLSClientConfig: tlsConfig, - Dial: (&net.Dialer{ - Timeout: connectTimeout, - KeepAlive: 30 * time.Second, - }).Dial, + DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { + d := net.Dialer{ + Timeout: connectTimeout, + KeepAlive: 30 * time.Second, + } + return d.DialContext(ctx, network, addr) + }, }, Timeout: requestTimeout, }, nil @@ -47,7 +51,7 @@ func setCACert(caCert string, tlsConfig *tls.Config) error { caCertPool = x509.NewCertPool() } if !strings.Contains(caCert, "BEGIN") { - contents, err := ioutil.ReadFile(caCert) + contents, err := os.ReadFile(caCert) if err != nil { return fmt.Errorf("could not load ca cert from file: %s", err) } diff --git a/network/init_test.go b/network/init_test.go index 78675befb..f5ea3aedd 100644 --- a/network/init_test.go +++ b/network/init_test.go @@ -1,7 +1,7 @@ package network_test import ( - "io/ioutil" + "os" "testing" . "github.com/onsi/ginkgo/v2" @@ -14,10 +14,10 @@ func TestNetwork(t *testing.T) { } func writeFile(contents string) string { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(file.Name(), []byte(contents), 0777) + err = os.WriteFile(file.Name(), []byte(contents), 0777) Expect(err).ToNot(HaveOccurred()) return file.Name() } diff --git a/network/progress_client_test.go b/network/progress_client_test.go index 27faae840..20bbd0e79 100644 --- a/network/progress_client_test.go +++ b/network/progress_client_test.go @@ -3,7 +3,6 @@ package network_test import ( "errors" "io" - "io/ioutil" "net/http" "strings" @@ -13,6 +12,7 @@ import ( "github.com/pivotal-cf/om/network/fakes" . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) @@ -33,13 +33,13 @@ var _ = Describe("ProgressClient", func() { Describe("Do", func() { It("makes a request to upload the product to the Ops Manager", func() { client.DoStub = func(req *http.Request) (*http.Response, error) { - _, err := io.Copy(ioutil.Discard, req.Body) + _, err := io.Copy(io.Discard, req.Body) Expect(err).ToNot(HaveOccurred()) err = req.Body.Close() Expect(err).ToNot(HaveOccurred()) return &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(strings.NewReader(`{}`)), + Body: io.NopCloser(strings.NewReader(`{}`)), }, nil } @@ -51,7 +51,7 @@ var _ = Describe("ProgressClient", func() { Expect(resp.StatusCode).To(Equal(http.StatusOK)) - rawRespBody, err := ioutil.ReadAll(resp.Body) + rawRespBody, err := io.ReadAll(resp.Body) Expect(err).ToNot(HaveOccurred()) Expect(string(rawRespBody)).To(Equal(`{}`)) @@ -66,7 +66,7 @@ var _ = Describe("ProgressClient", func() { client.DoReturns(&http.Response{ StatusCode: http.StatusOK, ContentLength: int64(len([]byte("fake-server-response"))), - Body: ioutil.NopCloser(strings.NewReader("fake-server-response")), + Body: io.NopCloser(strings.NewReader("fake-server-response")), }, nil) req, err := http.NewRequest("GET", "/some/endpoint", nil) @@ -77,7 +77,7 @@ var _ = Describe("ProgressClient", func() { Expect(resp.StatusCode).To(Equal(http.StatusOK)) - rawRespBody, err := ioutil.ReadAll(resp.Body) + rawRespBody, err := io.ReadAll(resp.Body) resp.Body.Close() Expect(err).ToNot(HaveOccurred()) @@ -109,7 +109,7 @@ var _ = Describe("ProgressClient", func() { It("returns an error", func() { client.DoReturns(&http.Response{ StatusCode: http.StatusRequestTimeout, - Body: ioutil.NopCloser(strings.NewReader(`something from nginx probably xml`)), + Body: io.NopCloser(strings.NewReader(`something from nginx probably xml`)), }, nil) var req *http.Request diff --git a/network/trace_client_test.go b/network/trace_client_test.go index 25c3a13f3..8e6703ca6 100644 --- a/network/trace_client_test.go +++ b/network/trace_client_test.go @@ -3,7 +3,7 @@ package network_test import ( "bytes" "errors" - "io/ioutil" + "io" "net/http" "net/http/httputil" "strings" @@ -76,7 +76,7 @@ var _ = Describe("Trace Client", func() { When("the request body is larger than some arbitrary value", func() { It("only dumps the headers", func() { - request.Body = ioutil.NopCloser(strings.NewReader(`{}`)) + request.Body = io.NopCloser(strings.NewReader(`{}`)) request.ContentLength = 1024 * 1024 _, err := traceClient.Do(request) @@ -98,7 +98,7 @@ var _ = Describe("Trace Client", func() { buffer.WriteString("a") } - response.Body = ioutil.NopCloser(&buffer) + response.Body = io.NopCloser(&buffer) response.ContentLength = int64(responseBodySize) _, err := traceClient.Do(request) diff --git a/network/unauthenticated_client_test.go b/network/unauthenticated_client_test.go index 5c861b8e9..fdab9ec9d 100644 --- a/network/unauthenticated_client_test.go +++ b/network/unauthenticated_client_test.go @@ -6,7 +6,7 @@ import ( "crypto/tls" "crypto/x509" "encoding/pem" - "io/ioutil" + "io" "log" "net/http" "net/http/httptest" @@ -47,7 +47,7 @@ var _ = Describe("UnauthenticatedClient", func() { Expect(response).ToNot(BeNil()) Expect(response.StatusCode).To(Equal(http.StatusTeapot)) - body, err := ioutil.ReadAll(response.Body) + body, err := io.ReadAll(response.Body) Expect(err).ToNot(HaveOccurred()) Expect(string(body)).To(Equal("response")) @@ -57,7 +57,7 @@ var _ = Describe("UnauthenticatedClient", func() { Expect(request.Method).To(Equal("GET")) Expect(request.URL.String()).To(Equal("/path?query")) - body, err = ioutil.ReadAll(request.Body) + body, err = io.ReadAll(request.Body) Expect(err).ToNot(HaveOccurred()) Expect(string(body)).To(Equal("request")) }) diff --git a/validator/sha256_calculator_test.go b/validator/sha256_calculator_test.go index a3c6124da..83cd45fc2 100644 --- a/validator/sha256_calculator_test.go +++ b/validator/sha256_calculator_test.go @@ -1,7 +1,7 @@ package validator_test import ( - "io/ioutil" + "os" "path/filepath" "github.com/pivotal-cf/om/validator" @@ -19,11 +19,11 @@ var _ = Describe("FileSHA256HashCalculator", func() { BeforeEach(func() { fileSHA256HashCalculator = validator.NewSHA256Calculator() - tempDir, err := ioutil.TempDir("", "") + tempDir, err := os.MkdirTemp("", "") Expect(err).ToNot(HaveOccurred()) fileToSHA256 = filepath.Join(tempDir, "file-to-sum") - err = ioutil.WriteFile(fileToSHA256, []byte("file contents"), 0644) + err = os.WriteFile(fileToSHA256, []byte("file contents"), 0644) Expect(err).ToNot(HaveOccurred()) }) diff --git a/vmlifecycle/acceptance/create_vm_test.go b/vmlifecycle/acceptance/create_vm_test.go index 4158377eb..4f2cb63a1 100644 --- a/vmlifecycle/acceptance/create_vm_test.go +++ b/vmlifecycle/acceptance/create_vm_test.go @@ -1,7 +1,7 @@ package integration_test import ( - "io/ioutil" + "os" "os/exec" . "github.com/onsi/ginkgo/v2" @@ -44,7 +44,7 @@ opsman-configuration: Eventually(session.Err).Should(gbytes.Say("gcloud compute instances create")) - contents, err := ioutil.ReadFile(stateFile) + contents, err := os.ReadFile(stateFile) Expect(err).ToNot(HaveOccurred()) Expect(contents).To(MatchYAML(`{"iaas": "gcp", "vm_id": "opsman-vm"}`)) }) diff --git a/vmlifecycle/acceptance/delete_vm_test.go b/vmlifecycle/acceptance/delete_vm_test.go index abce8cd72..13a06d22b 100644 --- a/vmlifecycle/acceptance/delete_vm_test.go +++ b/vmlifecycle/acceptance/delete_vm_test.go @@ -1,7 +1,7 @@ package integration_test import ( - "io/ioutil" + "os" "os/exec" . "github.com/onsi/ginkgo/v2" @@ -38,7 +38,7 @@ opsman-configuration: Eventually(session.Err).Should(gbytes.Say("gcloud compute instances delete")) - contents, err := ioutil.ReadFile(stateFile) + contents, err := os.ReadFile(stateFile) Expect(err).ToNot(HaveOccurred()) Expect(contents).To(MatchYAML(`{"iaas": "gcp"}`)) }) diff --git a/vmlifecycle/acceptance/integration_suite_test.go b/vmlifecycle/acceptance/integration_suite_test.go index dda5a9150..5fba6493c 100644 --- a/vmlifecycle/acceptance/integration_suite_test.go +++ b/vmlifecycle/acceptance/integration_suite_test.go @@ -1,7 +1,6 @@ package integration_test import ( - "io/ioutil" "os" "path/filepath" "strings" @@ -56,7 +55,7 @@ var _ = SynchronizedAfterSuite(func() {}, func() { }) func writeFile(contents string) string { - tempfile, err := ioutil.TempFile("", "some*.yaml") + tempfile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.WriteString(contents) Expect(err).ToNot(HaveOccurred()) diff --git a/vmlifecycle/acceptance/upgrade_opsman_test.go b/vmlifecycle/acceptance/upgrade_opsman_test.go index e3a569268..9a9f5e384 100644 --- a/vmlifecycle/acceptance/upgrade_opsman_test.go +++ b/vmlifecycle/acceptance/upgrade_opsman_test.go @@ -3,7 +3,6 @@ package integration_test import ( "archive/zip" "fmt" - "io/ioutil" "net/http" "os" "os/exec" @@ -17,7 +16,7 @@ import ( var _ = Describe("UpgradeOpsman", func() { createZipFile := func(files []struct{ Name, Body string }) string { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") w := zip.NewWriter(tmpFile) Expect(err).ToNot(HaveOccurred()) @@ -96,7 +95,7 @@ opsman-configuration: installation := createZipFile([]struct{ Name, Body string }{ {"installation.yml", ""}}) - fh, err := ioutil.TempFile("", "Ops1.1-build.123.yml") + fh, err := os.CreateTemp("", "Ops1.1-build.123.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -122,7 +121,7 @@ decryption-passphrase: password Eventually(session.Err).ShouldNot(gbytes.Say("gcloud")) - contents, err := ioutil.ReadFile(stateFile) + contents, err := os.ReadFile(stateFile) Expect(err).ToNot(HaveOccurred()) Expect(contents).To(MatchYAML(`{"iaas": "gcp", "vm_id": "opsman-vm"}`)) }) diff --git a/vmlifecycle/configfetchers/initialize.go b/vmlifecycle/configfetchers/initialize.go index fd4036ade..b808739e4 100644 --- a/vmlifecycle/configfetchers/initialize.go +++ b/vmlifecycle/configfetchers/initialize.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "io/ioutil" "net/url" "os" "strings" @@ -18,11 +17,12 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" "github.com/vmware/govmomi" "github.com/vmware/govmomi/vim25/soap" google "google.golang.org/api/compute/v1" "google.golang.org/api/option" + + "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" ) //go:generate counterfeiter -o ./fakes/export_opsman_config.go --fake-name OpsmanConfigFetcherService . OpsmanConfigFetcherService @@ -241,7 +241,7 @@ func validateGCPCreds(creds *Credentials) (err error) { errs = append(errs, fmt.Sprintf("gcp-service-account-json file (%s) cannot be found", creds.GCP.ServiceAccount)) } - contents, err := ioutil.ReadFile(creds.GCP.ServiceAccount) + contents, err := os.ReadFile(creds.GCP.ServiceAccount) if err != nil { errs = append(errs, fmt.Sprintf("could not read gcp-service-account-json file (%s): %s", creds.GCP.ServiceAccount, err)) } diff --git a/vmlifecycle/configfetchers/initialize_test.go b/vmlifecycle/configfetchers/initialize_test.go index 4afffe40e..ad91abe87 100644 --- a/vmlifecycle/configfetchers/initialize_test.go +++ b/vmlifecycle/configfetchers/initialize_test.go @@ -1,7 +1,6 @@ package configfetchers_test import ( - "io/ioutil" "os" "reflect" @@ -545,7 +544,7 @@ var _ = Describe("selects the correct config fetcher based on the state file", f }) func writeFile(contents string) string { - tempfile, err := ioutil.TempFile("", "some*.yaml") + tempfile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.WriteString(contents) Expect(err).ToNot(HaveOccurred()) diff --git a/vmlifecycle/taskmodifier/task_modifier.go b/vmlifecycle/taskmodifier/task_modifier.go index 1822d8b6c..d450a9979 100644 --- a/vmlifecycle/taskmodifier/task_modifier.go +++ b/vmlifecycle/taskmodifier/task_modifier.go @@ -3,14 +3,14 @@ package taskmodifier import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "strings" "github.com/bmatcuk/doublestar" - "github.com/pivotal-cf/om/interpolate" "gopkg.in/yaml.v2" + + "github.com/pivotal-cf/om/interpolate" ) type TaskModifier struct { @@ -75,7 +75,7 @@ func (c *TaskModifier) ModifyTasksWithSecrets(stderr io.Writer, taskDir string, func (c *TaskModifier) updateTaskWithSecrets(taskFilename string, secretNames []string) error { var task taskFile - contents, err := ioutil.ReadFile(taskFilename) + contents, err := os.ReadFile(taskFilename) if err != nil { return fmt.Errorf("could not read task file '%s': %s", taskFilename, err) } @@ -107,7 +107,7 @@ func (c *TaskModifier) updateTaskWithSecrets(taskFilename string, secretNames [] return fmt.Errorf("could not marshal modified task '%s': %s", taskFilename, err) } - err = ioutil.WriteFile(taskFilename, contents, 0666) + err = os.WriteFile(taskFilename, contents, 0666) if err != nil { return fmt.Errorf("could write modified task '%s': %s", taskFilename, err) } diff --git a/vmlifecycle/taskmodifier/task_modifier_suite_test.go b/vmlifecycle/taskmodifier/task_modifier_suite_test.go index e3b68809d..8a51008b2 100644 --- a/vmlifecycle/taskmodifier/task_modifier_suite_test.go +++ b/vmlifecycle/taskmodifier/task_modifier_suite_test.go @@ -1,7 +1,6 @@ package taskmodifier_test import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -20,12 +19,12 @@ func writeFile(filename string, contents string) { err := os.MkdirAll(dir, 0777) Expect(err).NotTo(HaveOccurred()) - err = ioutil.WriteFile(filename, []byte(contents), 0644) + err = os.WriteFile(filename, []byte(contents), 0644) Expect(err).NotTo(HaveOccurred()) } func readFile(filename string) string { - contents, err := ioutil.ReadFile(filename) + contents, err := os.ReadFile(filename) Expect(err).NotTo(HaveOccurred()) return string(contents) diff --git a/vmlifecycle/taskmodifier/task_modifier_test.go b/vmlifecycle/taskmodifier/task_modifier_test.go index ead7a135c..5a4ee6123 100644 --- a/vmlifecycle/taskmodifier/task_modifier_test.go +++ b/vmlifecycle/taskmodifier/task_modifier_test.go @@ -3,7 +3,7 @@ package taskmodifier_test import ( "fmt" "io" - "io/ioutil" + "os" "path/filepath" "github.com/onsi/gomega/gbytes" @@ -19,13 +19,13 @@ var _ = Describe("When modifying task files", func() { var taskDir string BeforeEach(func() { var err error - taskDir, err = ioutil.TempDir("", "") + taskDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) When("config directories are specified", func() { It("errors when one of the config directories does not exist", func() { - configDir, err := ioutil.TempDir("", "") + configDir, err := os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) taskModifier := taskmodifier.NewTaskModifier() @@ -42,7 +42,7 @@ var _ = Describe("When modifying task files", func() { var configDir string BeforeEach(func() { var err error - configDir, err = ioutil.TempDir("", "") + configDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) @@ -232,7 +232,7 @@ var _ = Describe("When modifying task files", func() { BeforeEach(func() { var err error - configDir, err = ioutil.TempDir("", "") + configDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) writeFile(filepath.Join(taskDir, "with-params.yml"), `params: {}`) @@ -247,7 +247,7 @@ var _ = Describe("When modifying task files", func() { BeforeEach(func() { var err error - varsDir, err = ioutil.TempDir("", "") + varsDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) writeFile(filepath.Join(varsDir, "whitelist-secrets.yml"), "nested:\n secret: secret-nested-value\nnon-nested-secret: non-nested-value") }) @@ -274,7 +274,7 @@ var _ = Describe("When modifying task files", func() { BeforeEach(func() { var err error - varsDir, err = ioutil.TempDir("", "") + varsDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) writeFile(filepath.Join(varsDir, "all-secrets.yml"), "nested:\n secret: secret-nested-value\nnon-nested-secret: non-nested-value\nnon-vars-file-secret: actually-a-secret\nanother-secret: secret2\nthird-secret: secret3") }) @@ -307,7 +307,7 @@ var _ = Describe("When modifying task files", func() { BeforeEach(func() { var err error - invalidVarsDir, err = ioutil.TempDir("", "{invalid") + invalidVarsDir, err = os.MkdirTemp("", "{invalid") Expect(err).NotTo(HaveOccurred()) }) @@ -326,7 +326,7 @@ var _ = Describe("When modifying task files", func() { BeforeEach(func() { var err error - varsDir, err = ioutil.TempDir("", "") + varsDir, err = os.MkdirTemp("", "") invalidFile := filepath.Join(varsDir, "invalid.yml") Expect(err).NotTo(HaveOccurred()) writeFile(filepath.Join(varsDir, "all-secrets.yml"), "nested:\n secret: secret-nested-value\nnon-nested-secret: non-nested-value\nnon-vars-file-secret: actually-a-secret") diff --git a/vmlifecycle/vmlifecyclecommands/create_vm.go b/vmlifecycle/vmlifecyclecommands/create_vm.go index d755c7245..7b85b534d 100644 --- a/vmlifecycle/vmlifecyclecommands/create_vm.go +++ b/vmlifecycle/vmlifecyclecommands/create_vm.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" @@ -72,7 +71,7 @@ func (c *CreateVM) Execute(args []string) error { } func writeStatefile(filename string, info vmmanagers.StateInfo) error { - return ioutil.WriteFile(filename, []byte(fmt.Sprintf("iaas: %s\nvm_id: %s", info.IAAS, info.ID)), 0644) + return os.WriteFile(filename, []byte(fmt.Sprintf("iaas: %s\nvm_id: %s", info.IAAS, info.ID)), 0644) } func (c *CreateVM) checkImageExists() (err error) { diff --git a/vmlifecycle/vmlifecyclecommands/create_vm_test.go b/vmlifecycle/vmlifecyclecommands/create_vm_test.go index 2a8974d91..d75c737c3 100644 --- a/vmlifecycle/vmlifecyclecommands/create_vm_test.go +++ b/vmlifecycle/vmlifecyclecommands/create_vm_test.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "github.com/jessevdk/go-flags" @@ -100,7 +99,7 @@ opsman-configuration: Expect(err).ToNot(HaveOccurred()) Expect(outWriter).To(gbytes.Say("OpsMan VM created successfully")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(`{"iaas": "gcp", "vm_id": vm-id}`)) @@ -141,7 +140,7 @@ opsman-configuration: Expect(outWriter).To(gbytes.Say("OpsMan VM created successfully")) Expect(command.StateFile).To(Equal("state.yml")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(`{"iaas": "gcp", "vm_id": vm-id}`)) @@ -159,7 +158,7 @@ opsman-configuration: Expect(err).ToNot(HaveOccurred()) Expect(outWriter).To(gbytes.Say("VM already exists, not attempting to create it")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(`{"iaas": "gcp", "vm_id": vm-id}`)) @@ -414,7 +413,7 @@ opsman-configuration: err := command.Execute([]string{}) Expect(err.Error()).To(Equal("the VM was created, but subsequent configuration failed: unknown error")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(`{"iaas": "gcp", "vm_id": vm-id}`)) diff --git a/vmlifecycle/vmlifecyclecommands/delete_vm.go b/vmlifecycle/vmlifecyclecommands/delete_vm.go index 244085ae0..c3f15f79e 100644 --- a/vmlifecycle/vmlifecyclecommands/delete_vm.go +++ b/vmlifecycle/vmlifecyclecommands/delete_vm.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "reflect" "sort" + "gopkg.in/yaml.v2" + "github.com/pivotal-cf/om/interpolate" "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" - "gopkg.in/yaml.v2" ) type initDeleteFunc func(config *vmmanagers.OpsmanConfigFilePayload, image string, state vmmanagers.StateInfo, outWriter, errWriter io.Writer) (vmmanagers.DeleteVMService, error) @@ -58,7 +58,7 @@ func (c DeleteVM) Execute(args []string) error { _, _ = c.stdout.Write([]byte("VM deleted successfully\n")) - return ioutil.WriteFile(c.StateFile, []byte(fmt.Sprintf(`iaas: %s`, state.IAAS)), 0644) + return os.WriteFile(c.StateFile, []byte(fmt.Sprintf(`iaas: %s`, state.IAAS)), 0644) } func loadConfigAndState(configFilename string, stateFilename string, useStateFileError bool, varsEnv []string, varsFile []string) (*vmmanagers.OpsmanConfigFilePayload, vmmanagers.StateInfo, error) { @@ -86,7 +86,7 @@ func loadConfigAndState(configFilename string, stateFilename string, useStateFil } state := vmmanagers.StateInfo{} - content, err := ioutil.ReadFile(stateFilename) + content, err := os.ReadFile(stateFilename) if err != nil && useStateFileError { return nil, vmmanagers.StateInfo{}, err } diff --git a/vmlifecycle/vmlifecyclecommands/delete_vm_test.go b/vmlifecycle/vmlifecyclecommands/delete_vm_test.go index 321a7b89f..a4f333a67 100644 --- a/vmlifecycle/vmlifecyclecommands/delete_vm_test.go +++ b/vmlifecycle/vmlifecyclecommands/delete_vm_test.go @@ -3,7 +3,6 @@ package vmlifecyclecommands_test import ( "fmt" "io" - "io/ioutil" "os" "time" @@ -86,7 +85,7 @@ opsman-configuration: Expect(err).ToNot(HaveOccurred()) Expect(outWriter).To(gbytes.Say("VM deleted successfully\n")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(fmt.Sprintf(`{"iaas": "iaas-%d"}`, uuid))) @@ -104,7 +103,7 @@ opsman-configuration: Expect(err).ToNot(HaveOccurred()) Expect(outWriter).To(gbytes.Say("Nothing to do\n")) - finalState, err := ioutil.ReadFile(command.StateFile) + finalState, err := os.ReadFile(command.StateFile) Expect(err).ToNot(HaveOccurred()) Expect(finalState).To(MatchYAML(`{"iaas": "gcp"}`)) diff --git a/vmlifecycle/vmlifecyclecommands/export_opsman_config.go b/vmlifecycle/vmlifecyclecommands/export_opsman_config.go index 99cdc7373..c62ee800e 100644 --- a/vmlifecycle/vmlifecyclecommands/export_opsman_config.go +++ b/vmlifecycle/vmlifecyclecommands/export_opsman_config.go @@ -3,12 +3,12 @@ package vmlifecyclecommands import ( "fmt" "io" - "io/ioutil" "os" + "gopkg.in/yaml.v2" + "github.com/pivotal-cf/om/vmlifecycle/configfetchers" "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" - "gopkg.in/yaml.v2" ) type initExportOpsmanConfigFunc func(state *vmmanagers.StateInfo, creds *configfetchers.Credentials) (configfetchers.OpsmanConfigFetcherService, error) @@ -47,7 +47,7 @@ func NewExportOpsmanConfigCommand(stdout, stderr io.Writer, initService initExpo func (e *ExportOpsmanConfig) Execute(args []string) error { state := vmmanagers.StateInfo{} - content, err := ioutil.ReadFile(e.StateFile) + content, err := os.ReadFile(e.StateFile) if err != nil { return fmt.Errorf("could not read state file %s", err) } @@ -112,7 +112,7 @@ func (e *ExportOpsmanConfig) writeConfigFile(opsmanConfigFilePayload *vmmanagers return fmt.Errorf("could not marshal the fetch opsman config: %s", err) } - err = ioutil.WriteFile(e.ConfigFile, bytes, os.ModePerm) + err = os.WriteFile(e.ConfigFile, bytes, os.ModePerm) if err != nil { return fmt.Errorf("could not write the opsman config file: %s", err) } diff --git a/vmlifecycle/vmlifecyclecommands/export_opsman_config_test.go b/vmlifecycle/vmlifecyclecommands/export_opsman_config_test.go index 73c0f1f66..8e2cbee8c 100644 --- a/vmlifecycle/vmlifecyclecommands/export_opsman_config_test.go +++ b/vmlifecycle/vmlifecyclecommands/export_opsman_config_test.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "io" - "io/ioutil" + "os" "github.com/onsi/gomega/gbytes" @@ -35,10 +35,10 @@ var _ = Describe("Export Opsman Config", func() { return &vmmanagers.OpsmanConfigFilePayload{}, nil } - stateFile, err := ioutil.TempFile("", "") + stateFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - configFile, err := ioutil.TempFile("", "") + configFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exportOpsmanConfigCommand(outWriter, errWriter, fakeService, "") @@ -48,7 +48,7 @@ var _ = Describe("Export Opsman Config", func() { err = command.Execute(nil) Expect(err).ToNot(HaveOccurred()) - config, err := ioutil.ReadFile(configFile.Name()) + config, err := os.ReadFile(configFile.Name()) Expect(err).ToNot(HaveOccurred()) Expect(outWriter).To(gbytes.Say(fmt.Sprintf("successfully wrote the Ops Manager config file to: %s", configFile.Name()))) @@ -70,7 +70,7 @@ var _ = Describe("Export Opsman Config", func() { When("the state file is invalid", func() { It("returns an error", func() { - stateFile, err := ioutil.TempFile("", "") + stateFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = stateFile.Write([]byte("invalid-state-file-content")) @@ -87,10 +87,10 @@ var _ = Describe("Export Opsman Config", func() { When("the init service fails to initialize", func() { It("returns an error", func() { - stateFile, err := ioutil.TempFile("", "") + stateFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - configFile, err := ioutil.TempFile("", "") + configFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exportOpsmanConfigCommand(outWriter, errWriter, fakeService, "failed to init") @@ -109,10 +109,10 @@ var _ = Describe("Export Opsman Config", func() { return &vmmanagers.OpsmanConfigFilePayload{}, errors.New("fetch failed") } - stateFile, err := ioutil.TempFile("", "") + stateFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) - configFile, err := ioutil.TempFile("", "") + configFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) command := exportOpsmanConfigCommand(outWriter, errWriter, fakeService, "") diff --git a/vmlifecycle/vmlifecyclecommands/prepare-tasks-with-secrets_test.go b/vmlifecycle/vmlifecyclecommands/prepare-tasks-with-secrets_test.go index fe95a9fc4..b40b5caaf 100644 --- a/vmlifecycle/vmlifecyclecommands/prepare-tasks-with-secrets_test.go +++ b/vmlifecycle/vmlifecyclecommands/prepare-tasks-with-secrets_test.go @@ -3,7 +3,7 @@ package vmlifecyclecommands_test import ( "errors" "io" - "io/ioutil" + "os" "path/filepath" "github.com/onsi/gomega/gbytes" @@ -32,19 +32,19 @@ var _ = Describe("PrepareTasksWithSecrets", func() { errWriter = gbytes.NewBuffer() var err error - taskDir, err = ioutil.TempDir("", "") + taskDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) - configDir, err = ioutil.TempDir("", "") + configDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) - configDir2, err = ioutil.TempDir("", "") + configDir2, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) - varsDir, err = ioutil.TempDir("", "") + varsDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) - varsDir2, err = ioutil.TempDir("", "") + varsDir2, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) diff --git a/vmlifecycle/vmlifecyclecommands/unit_suite_test.go b/vmlifecycle/vmlifecyclecommands/unit_suite_test.go index 076185e4a..84228805e 100644 --- a/vmlifecycle/vmlifecyclecommands/unit_suite_test.go +++ b/vmlifecycle/vmlifecyclecommands/unit_suite_test.go @@ -1,7 +1,6 @@ package vmlifecyclecommands_test import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -20,12 +19,12 @@ func writeSpecifiedFile(filename string, contents string) { err := os.MkdirAll(dir, 0777) Expect(err).NotTo(HaveOccurred()) - err = ioutil.WriteFile(filename, []byte(contents), 0644) + err = os.WriteFile(filename, []byte(contents), 0644) Expect(err).NotTo(HaveOccurred()) } func writeFile(contents string) string { - tempfile, err := ioutil.TempFile("", "2.2-build.296.yml") + tempfile, err := os.CreateTemp("", "2.2-build.296.yml") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.WriteString(contents) Expect(err).ToNot(HaveOccurred()) @@ -36,7 +35,7 @@ func writeFile(contents string) string { } func readFile(filename string) string { - contents, err := ioutil.ReadFile(filename) + contents, err := os.ReadFile(filename) Expect(err).ToNot(HaveOccurred()) return string(contents) } diff --git a/vmlifecycle/vmlifecyclecommands/upgrade_opsman.go b/vmlifecycle/vmlifecyclecommands/upgrade_opsman.go index 92684a1f4..54c37cc7d 100644 --- a/vmlifecycle/vmlifecyclecommands/upgrade_opsman.go +++ b/vmlifecycle/vmlifecyclecommands/upgrade_opsman.go @@ -6,18 +6,18 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" "strings" "time" + "gopkg.in/yaml.v2" + "github.com/pivotal-cf/om/interpolate" "github.com/pivotal-cf/om/vmlifecycle/extractopsmansemver" "github.com/pivotal-cf/om/vmlifecycle/runner" "github.com/pivotal-cf/om/vmlifecycle/vmmanagers" - "gopkg.in/yaml.v2" ) type opsmanVersion struct { @@ -290,7 +290,7 @@ func (n *UpgradeOpsman) validate() error { func (n *UpgradeOpsman) validateImportInstallationConfig() error { target := target{} - content, err := ioutil.ReadFile(n.ImportInstallation.EnvFile) + content, err := os.ReadFile(n.ImportInstallation.EnvFile) if err != nil { return err } diff --git a/vmlifecycle/vmlifecyclecommands/upgrade_opsman_test.go b/vmlifecycle/vmlifecyclecommands/upgrade_opsman_test.go index 8b6006961..e2c74da42 100644 --- a/vmlifecycle/vmlifecyclecommands/upgrade_opsman_test.go +++ b/vmlifecycle/vmlifecyclecommands/upgrade_opsman_test.go @@ -6,7 +6,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "os" "time" @@ -265,7 +264,7 @@ var _ = Describe("upgradeOpsman", func() { "decryption-passphrase": "decryption-passphrase", })) - fh, err := ioutil.TempFile("", fmt.Sprintf(fileNameFixture, newerVersion)) + fh, err := os.CreateTemp("", fmt.Sprintf(fileNameFixture, newerVersion)) Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -317,7 +316,7 @@ var _ = Describe("upgradeOpsman", func() { "decryption-passphrase": "decryption-passphrase", })) - fh, err := ioutil.TempFile("", fmt.Sprintf(fileNameFixture, newerVersion)) + fh, err := os.CreateTemp("", fmt.Sprintf(fileNameFixture, newerVersion)) Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -372,7 +371,7 @@ var _ = Describe("upgradeOpsman", func() { "decryption-passphrase": "decryption-passphrase", })) - fh, err := ioutil.TempFile("", fmt.Sprintf(fileNameFixture, newerVersion)) + fh, err := os.CreateTemp("", fmt.Sprintf(fileNameFixture, newerVersion)) Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -444,7 +443,7 @@ var _ = Describe("upgradeOpsman", func() { "decryption-passphrase": "decryption-passphrase", })) - image, err := ioutil.TempFile("", fmt.Sprintf(fileNameFixture, newerVersion)) + image, err := os.CreateTemp("", fmt.Sprintf(fileNameFixture, newerVersion)) Expect(err).ToNot(HaveOccurred()) command.CreateVM.ImageFile = image.Name() err = command.Execute([]string{}) @@ -517,7 +516,7 @@ var _ = Describe("upgradeOpsman", func() { "skip-ssl-validation": true, "decryption-passphrase": "decryption-passphrase", })) - image, err := ioutil.TempFile("", "OpsManager2.10-build.296onGCP.yml") + image, err := os.CreateTemp("", "OpsManager2.10-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) command.CreateVM.ImageFile = image.Name() @@ -555,7 +554,7 @@ var _ = Describe("upgradeOpsman", func() { "decryption-passphrase": "passphrase", })) - fh, err := ioutil.TempFile("", "OpsManager2.2-build.296onGCP.yml") + fh, err := os.CreateTemp("", "OpsManager2.2-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -578,7 +577,7 @@ var _ = Describe("upgradeOpsman", func() { "skip-ssl-validation": true, })) - fh, err := ioutil.TempFile("", "OpsManager2.2-build.296onGCP.yml") + fh, err := os.CreateTemp("", "OpsManager2.2-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -623,7 +622,7 @@ opsman-configuration: "decryption-passphrase": "decryption-passphrase", })) - image, err := ioutil.TempFile("", fmt.Sprintf("OpsManager%sonGCP.yml", "2.2.3")) + image, err := os.CreateTemp("", fmt.Sprintf("OpsManager%sonGCP.yml", "2.2.3")) Expect(err).ToNot(HaveOccurred()) command.CreateVM.ImageFile = image.Name() }) @@ -728,7 +727,7 @@ project_name: awesome-project "decryption-passphrase": "decryption-passphrase", })) - fh, err := ioutil.TempFile("", "OpsManager2.2-build.296onGCP.yml") + fh, err := os.CreateTemp("", "OpsManager2.2-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -749,7 +748,7 @@ project_name: awesome-project "skip-ssl-validation": true, })) - fh, err := ioutil.TempFile("", "OpsManager2.2-build.296onGCP.yml") + fh, err := os.CreateTemp("", "OpsManager2.2-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -769,7 +768,7 @@ project_name: awesome-project "skip-ssl-validation": true, })) - fh, err := ioutil.TempFile("", "OpsManager2.2-build.296onGCP.yml") + fh, err := os.CreateTemp("", "OpsManager2.2-build.296onGCP.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -791,7 +790,7 @@ project_name: awesome-project "decryption-passphrase": "passphrase", })) - fh, err := ioutil.TempFile("", "OpsManager2.2.yml") + fh, err := os.CreateTemp("", "OpsManager2.2.yml") Expect(err).ToNot(HaveOccurred()) Expect(fh.Close()).ToNot(HaveOccurred()) @@ -870,19 +869,19 @@ project_name: awesome-project JustBeforeEach(func() { var err error - configFile, err = ioutil.TempFile("", "") + configFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred()) _, err = configFile.WriteString(configContent) Expect(err).ToNot(HaveOccurred()) - envFile, err = ioutil.TempFile("", "") + envFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred()) _, err = envFile.WriteString(envContent) Expect(err).ToNot(HaveOccurred()) - imageFile, err = ioutil.TempFile("", "opsman-2.2.2*.yml") + imageFile, err = os.CreateTemp("", "opsman-2.2.2*.yml") Expect(err).ToNot(HaveOccurred()) _, err = imageFile.WriteString(imageContent) Expect(err).ToNot(HaveOccurred()) @@ -890,12 +889,12 @@ project_name: awesome-project installationFile = createZipFile([]struct{ Name, Body string }{ {"installation.yml", ""}}) - stateFile, err = ioutil.TempFile("", "") + stateFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = stateFile.WriteString(stateContent) Expect(err).ToNot(HaveOccurred()) - varsFile, err = ioutil.TempFile("", "") + varsFile, err = os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = varsFile.WriteString(varsContent) Expect(err).ToNot(HaveOccurred()) @@ -991,7 +990,7 @@ project_name: awesome-project When("installation zip file does not have required installation.yml", func() { var invalidInstallationZipName string JustBeforeEach(func() { - invalidInstallationZip, err := ioutil.TempFile("", "") + invalidInstallationZip, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) _, err = invalidInstallationZip.WriteString(installationContent) Expect(err).ToNot(HaveOccurred()) @@ -1107,7 +1106,7 @@ project_name: awesome-project }) func createZipFile(files []struct{ Name, Body string }) string { - tmpFile, err := ioutil.TempFile("", "") + tmpFile, err := os.CreateTemp("", "") w := zip.NewWriter(tmpFile) Expect(err).ToNot(HaveOccurred()) diff --git a/vmlifecycle/vmmanagers/aws.go b/vmlifecycle/vmmanagers/aws.go index 3d5f381fc..fc85ada7a 100644 --- a/vmlifecycle/vmmanagers/aws.go +++ b/vmlifecycle/vmmanagers/aws.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "math" "os" "sort" @@ -206,7 +205,7 @@ source_profile = svc-account region = %s`, config.AccessKeyId, config.SecretAccessKey, config.AssumeRole, config.Region) if config.AssumeRole != "" { - file, err := ioutil.TempFile("", "awsConfig") + file, err := os.CreateTemp("", "awsConfig") defer os.Remove(file.Name()) if err != nil { return nil, nil, err @@ -495,7 +494,7 @@ func (a *AWSConfig) validateDeprecations() error { func amiFromRegion(region, imageFile string) (imageURI string, err error) { var images map[string]string - contents, err := ioutil.ReadFile(imageFile) + contents, err := os.ReadFile(imageFile) if err != nil { return "", err } diff --git a/vmlifecycle/vmmanagers/aws_test.go b/vmlifecycle/vmmanagers/aws_test.go index 1dfd9a03e..946cdb454 100644 --- a/vmlifecycle/vmmanagers/aws_test.go +++ b/vmlifecycle/vmmanagers/aws_test.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "strings" "sync/atomic" @@ -30,7 +29,7 @@ var _ = Describe("AWS VMManager", func() { err = yaml.Unmarshal([]byte(config), &validConfig) Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAWSVMManager(ioutil.Discard, ioutil.Discard, validConfig, writeAMIRegionFile(), vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAWSVMManager(io.Discard, io.Discard, validConfig, writeAMIRegionFile(), vmmanagers.StateInfo{}, runner, time.Millisecond) return command, runner } @@ -433,7 +432,7 @@ credential_source = Ec2InstanceMetadata`)), comment) When("the image file is not valid YAML", func() { It("returns that the yaml is invalid", func() { - invalidUriFile, err := ioutil.TempFile("", "some*.yaml") + invalidUriFile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, _ = invalidUriFile.WriteString("not valid yaml") Expect(invalidUriFile.Close()).ToNot(HaveOccurred()) @@ -688,7 +687,7 @@ opsman-configuration: AWS: &vmmanagers.AWSConfig{}, }} - command := vmmanagers.NewAWSVMManager(ioutil.Discard, ioutil.Discard, invalidConfig, "", state, nil, time.Millisecond) + command := vmmanagers.NewAWSVMManager(io.Discard, io.Discard, invalidConfig, "", state, nil, time.Millisecond) err := command.DeleteVM() Expect(err).To(HaveOccurred()) diff --git a/vmlifecycle/vmmanagers/azure.go b/vmlifecycle/vmmanagers/azure.go index 85fe4007d..5459302da 100644 --- a/vmlifecycle/vmmanagers/azure.go +++ b/vmlifecycle/vmmanagers/azure.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" + "os" "strconv" "strings" "time" @@ -258,7 +258,7 @@ func (a *AzureVMManager) addEnvVars() []string { func (a *AzureVMManager) getImage() (imageURL string, err error) { var images map[string]string - contents, err := ioutil.ReadFile(a.ImageYaml) + contents, err := os.ReadFile(a.ImageYaml) if err != nil { return "", err } @@ -464,7 +464,7 @@ func (a *AzureVMManager) createImage(imageUri string, imageName string) (string, func (a *AzureVMManager) createVM(imageUrl string, imageID string, publicIP string) error { azure := a.Config.OpsmanConfig.Azure - file, err := ioutil.TempFile("", "ssh-key") + file, err := os.CreateTemp("", "ssh-key") if err != nil { return fmt.Errorf("azure error: %s", err) } diff --git a/vmlifecycle/vmmanagers/azure_test.go b/vmlifecycle/vmmanagers/azure_test.go index 39a0b77d2..790ed402a 100644 --- a/vmlifecycle/vmmanagers/azure_test.go +++ b/vmlifecycle/vmmanagers/azure_test.go @@ -4,7 +4,8 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "io" + "os" "strings" "time" @@ -24,7 +25,7 @@ var _ = Describe("Azure VMManager", func() { createCommand := func(region string, configStrTemplate string, state vmmanagers.StateInfo) (*vmmanagers.AzureVMManager, *fakes.AzureRunner, *bytes.Buffer) { var err error runner := &fakes.AzureRunner{} - testUriFile, err := ioutil.TempFile("", "some*.yaml") + testUriFile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, _ = testUriFile.WriteString(` --- @@ -40,7 +41,7 @@ southeast_asia: https://opsmanagersoutheastasia.blob.core.windows.net/images/ops Expect(err).ToNot(HaveOccurred()) stderr := &bytes.Buffer{} - command := vmmanagers.NewAzureVMManager(ioutil.Discard, stderr, validConfig, testUriFile.Name(), state, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, stderr, validConfig, testUriFile.Name(), state, runner, time.Millisecond) return command, runner, stderr } @@ -666,14 +667,14 @@ opsman-configuration: runner := &fakes.AzureRunner{} runner.ExecuteWithEnvVarsReturns(bytes.NewBufferString("\"success\"\r\n"), nil, nil) - invalidUriFile, err := ioutil.TempFile("", "some*.yaml") + invalidUriFile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, _ = invalidUriFile.WriteString("not valid yaml") Expect(invalidUriFile.Close()).ToNot(HaveOccurred()) err = yaml.UnmarshalStrict([]byte(fmt.Sprintf(configStrTemplate, "us-west-1")), &validConfig) Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, validConfig, invalidUriFile.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, validConfig, invalidUriFile.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) _, _, err = command.CreateVM() Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("cannot unmarshal")) @@ -703,7 +704,7 @@ opsman-configuration: err := yaml.UnmarshalStrict([]byte(fmt.Sprintf(configStrTemplate, "us-west-1")), &validConfig) Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, validConfig, "does-not-exist.yml", vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, validConfig, "does-not-exist.yml", vmmanagers.StateInfo{}, runner, time.Millisecond) _, _, err = command.CreateVM() Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("open does-not-exist.yml")) @@ -730,7 +731,7 @@ opsman-configuration: }} runner := &fakes.AzureRunner{} - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, invalidConfig, "", vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, invalidConfig, "", vmmanagers.StateInfo{}, runner, time.Millisecond) _, _, err := command.CreateVM() Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("Field validation for '%s' failed on the 'required' tag", param))) }, @@ -768,10 +769,10 @@ opsman-configuration: runner := &fakes.AzureRunner{} - file, err := ioutil.TempFile("", "some*.yml") + file, err := os.CreateTemp("", "some*.yml") Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) runner.ExecuteWithEnvVarsReturns(bytes.NewBufferString("\"success\"\r\n"), nil, nil) _, _, err = command.CreateVM() Expect(err).ToNot(HaveOccurred()) @@ -806,9 +807,9 @@ opsman-configuration: err := yaml.UnmarshalStrict([]byte(configStr), &validConfig) Expect(err).ToNot(HaveOccurred()) - file, err := ioutil.TempFile("", "some*.yml") + file, err := os.CreateTemp("", "some*.yml") Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) runner.ExecuteWithEnvVarsReturns(bytes.NewBufferString("\"success\"\r\n"), nil, nil) _, _, err = command.CreateVM() @@ -842,10 +843,10 @@ opsman-configuration: runner := &fakes.AzureRunner{} - file, err := ioutil.TempFile("", "some*.yml") + file, err := os.CreateTemp("", "some*.yml") Expect(err).ToNot(HaveOccurred()) - command := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) + command := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, validConfig, file.Name(), vmmanagers.StateInfo{}, runner, time.Millisecond) _, _, err = command.CreateVM() Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("expected \"use_managed_disk\" to be a boolean. Got: notABoolean.")) @@ -1046,7 +1047,7 @@ opsman-configuration: }} runner := &fakes.AzureRunner{} - azureRunner := vmmanagers.NewAzureVMManager(ioutil.Discard, ioutil.Discard, invalidConfig, "", vmmanagers.StateInfo{}, runner, time.Millisecond) + azureRunner := vmmanagers.NewAzureVMManager(io.Discard, io.Discard, invalidConfig, "", vmmanagers.StateInfo{}, runner, time.Millisecond) err := azureRunner.DeleteVM() Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("Field validation for '%s' failed on the 'required' tag", param))) }, diff --git a/vmlifecycle/vmmanagers/gcp.go b/vmlifecycle/vmmanagers/gcp.go index 2fd98e69e..78b1a208d 100644 --- a/vmlifecycle/vmmanagers/gcp.go +++ b/vmlifecycle/vmmanagers/gcp.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "os" "path/filepath" "strings" @@ -330,7 +330,7 @@ func (g *GCPVMManager) deleteVM(id string) error { } func (g *GCPVMManager) generateServiceAccountKeyFile() (serviceAccountFileName string, err error) { - serviceAccountFile, err := ioutil.TempFile("", "key.yaml") + serviceAccountFile, err := os.CreateTemp("", "key.yaml") if err != nil { return "", err } @@ -410,7 +410,7 @@ func (f imageGCPFormat) get(s string) string { func loadImageYaml(imageYaml string) (imageGCPFormat, error) { var imageUriMap imageGCPFormat - imageUriMapByte, err := ioutil.ReadFile(imageYaml) + imageUriMapByte, err := os.ReadFile(imageYaml) if err != nil { return imageUriMap, err } diff --git a/vmlifecycle/vmmanagers/gcp_test.go b/vmlifecycle/vmmanagers/gcp_test.go index 04f16f600..8e83473af 100644 --- a/vmlifecycle/vmmanagers/gcp_test.go +++ b/vmlifecycle/vmmanagers/gcp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "os" "github.com/pivotal-cf/om/vmlifecycle/matchers" @@ -20,7 +20,7 @@ var _ = Describe("GCP VMManager", func() { createCommand := func(region string, configStrTemplate string) (*vmmanagers.GCPVMManager, *fakes.GCloudRunner) { var err error runner := &fakes.GCloudRunner{} - testUriFile, err := ioutil.TempFile("", "some*.yml") + testUriFile, err := os.CreateTemp("", "some*.yml") Expect(err).ToNot(HaveOccurred()) _, _ = testUriFile.WriteString(` --- @@ -443,7 +443,7 @@ opsman-configuration: It("returns that the yaml is invalid", func() { command, _ := createCommand("us-west1", configStrTemplate) - invalidUriFile, err := ioutil.TempFile("", "some*.yaml") + invalidUriFile, err := os.CreateTemp("", "some*.yaml") Expect(err).ToNot(HaveOccurred()) _, _ = invalidUriFile.WriteString("not valid yaml") Expect(invalidUriFile.Close()).ToNot(HaveOccurred()) diff --git a/vmlifecycle/vmmanagers/openstack_test.go b/vmlifecycle/vmmanagers/openstack_test.go index 19f093f61..e46d0ec9c 100644 --- a/vmlifecycle/vmmanagers/openstack_test.go +++ b/vmlifecycle/vmmanagers/openstack_test.go @@ -4,9 +4,10 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "os" . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" "gopkg.in/yaml.v2" @@ -20,7 +21,7 @@ var _ = Describe("Openstack VMManager", func() { createCommand := func(configStrTemplate string) (*vmmanagers.OpenstackVMManager, *fakes.OpenstackRunner) { var err error runner := &fakes.OpenstackRunner{} - testUriFile, err := ioutil.TempFile("", "") + testUriFile, err := os.CreateTemp("", "") Expect(err).ToNot(HaveOccurred()) state := vmmanagers.StateInfo{ diff --git a/vmlifecycle/vmmanagers/vmmanagers_suite_test.go b/vmlifecycle/vmmanagers/vmmanagers_suite_test.go index cf21e0c05..7422c2cab 100644 --- a/vmlifecycle/vmmanagers/vmmanagers_suite_test.go +++ b/vmlifecycle/vmmanagers/vmmanagers_suite_test.go @@ -2,7 +2,6 @@ package vmmanagers_test import ( "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -56,7 +55,7 @@ var _ = AfterSuite(func() { func testIAASForPropertiesInExampleFile(iaas string) { It("has an example file the represents all the correct fields", func() { filename := fmt.Sprintf("../../../docs-platform-automation/docs/examples/opsman-config/%s.yml", strings.ToLower(iaas)) - exampleFile, err := ioutil.ReadFile(filename) + exampleFile, err := os.ReadFile(filename) Expect(err).ToNot(HaveOccurred()) isolateCommentedParamRegex := regexp.MustCompile(`(?m)^(\s+)# ([\w-]+: )`) @@ -103,7 +102,7 @@ func testPropertiesExist(vst reflect.Value, filename string) { } func writePDFFile(contents string) string { - tempfile, err := ioutil.TempFile("", "some*.pdf") + tempfile, err := os.CreateTemp("", "some*.pdf") Expect(err).ToNot(HaveOccurred()) _, err = tempfile.WriteString(contents) Expect(err).ToNot(HaveOccurred()) diff --git a/vmlifecycle/vmmanagers/vsphere.go b/vmlifecycle/vmmanagers/vsphere.go index 49127615e..12757a97f 100644 --- a/vmlifecycle/vmmanagers/vsphere.go +++ b/vmlifecycle/vmmanagers/vsphere.go @@ -7,14 +7,15 @@ import ( "encoding/json" "errors" "fmt" - "github.com/blang/semver" - "github.com/pivotal-cf/om/vmlifecycle/extractopsmansemver" - "io/ioutil" "log" "os" "strconv" "strings" "time" + + "github.com/blang/semver" + + "github.com/pivotal-cf/om/vmlifecycle/extractopsmansemver" ) type VcenterCredential struct { @@ -251,12 +252,12 @@ func (v *VsphereVMManager) createOptionsFile() (optionsFileName string, err erro return "", fmt.Errorf("options failed to marshal: %s", err) } - optionsFile, err := ioutil.TempFile("", "options.json") + optionsFile, err := os.CreateTemp("", "options.json") if err != nil { return "", fmt.Errorf("could not create temp option file: %s", err) } - err = ioutil.WriteFile(optionsFile.Name(), optionsBytes, 0644) + err = os.WriteFile(optionsFile.Name(), optionsBytes, 0644) if err != nil { return "", fmt.Errorf("could not write options to file: %s", err) } @@ -289,7 +290,7 @@ func (v *VsphereVMManager) addEnvVars() (envVarsList []string, err error) { ) if v.Config.OpsmanConfig.Vsphere.Vcenter.CACert != "" { - caCertFile, err := ioutil.TempFile("", "ca.crt") + caCertFile, err := os.CreateTemp("", "ca.crt") if err != nil { return []string{}, fmt.Errorf("could not create temp file for ca cert: %s", err) } diff --git a/vmlifecycle/vmmanagers/vsphere_test.go b/vmlifecycle/vmmanagers/vsphere_test.go index de02f8db9..66cb25cac 100644 --- a/vmlifecycle/vmmanagers/vsphere_test.go +++ b/vmlifecycle/vmmanagers/vsphere_test.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" . "github.com/onsi/ginkgo/v2" @@ -428,7 +427,7 @@ opsman-configuration: BeforeEach(func() { var err error - invalidOVA, err = ioutil.TempFile("", "test.ova") + invalidOVA, err = os.CreateTemp("", "test.ova") Expect(err).ToNot(HaveOccurred()) _, _ = invalidOVA.WriteString("some-string-that-makes-the-ova-invalid") Expect(invalidOVA.Close()).ToNot(HaveOccurred()) @@ -755,13 +754,13 @@ opsman-configuration: }) func createOVA(opsmanVersion string) *os.File { - ovaFile, err := ioutil.TempFile("", fmt.Sprintf("opsman-%s-*-.ova", opsmanVersion)) + ovaFile, err := os.CreateTemp("", fmt.Sprintf("opsman-%s-*-.ova", opsmanVersion)) Expect(err).ToNot(HaveOccurred()) defer ovaFile.Close() tarWriter := tar.NewWriter(ovaFile) defer tarWriter.Close() - ovfFile, err := ioutil.TempFile("", "file*.ovf") + ovfFile, err := os.CreateTemp("", "file*.ovf") Expect(err).ToNot(HaveOccurred()) header := &tar.Header{