From d9d96169d82d55e1b1b6179926f6967bcd73fe9c Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 3 Nov 2021 11:41:54 +0100 Subject: [PATCH] remove googlecompute plugin from bundled plugins --- command/vendored_plugins.go | 20 +++++++------------- main.go | 7 ++++--- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/command/vendored_plugins.go b/command/vendored_plugins.go index 276be343d..6d2e659b3 100644 --- a/command/vendored_plugins.go +++ b/command/vendored_plugins.go @@ -17,9 +17,6 @@ import ( convergeprovisioner "github.com/hashicorp/packer-plugin-converge/provisioner/converge" digitaloceanbuilder "github.com/hashicorp/packer-plugin-digitalocean/builder/digitalocean" digitaloceanimportpostprocessor "github.com/hashicorp/packer-plugin-digitalocean/post-processor/digitalocean-import" - googlecomputebuilder "github.com/hashicorp/packer-plugin-googlecompute/builder/googlecompute" - googlecomputeexportpostprocessor "github.com/hashicorp/packer-plugin-googlecompute/post-processor/googlecompute-export" - googlecomputeimportpostprocessor "github.com/hashicorp/packer-plugin-googlecompute/post-processor/googlecompute-import" hcloudbuilder "github.com/hashicorp/packer-plugin-hcloud/builder/hcloud" hyperonebuilder "github.com/hashicorp/packer-plugin-hyperone/builder/hyperone" hypervisobuilder "github.com/hashicorp/packer-plugin-hyperv/builder/hyperv/iso" @@ -68,7 +65,6 @@ var VendoredBuilders = map[string]packersdk.Builder{ "alicloud-ecs": new(alicloudecsbuilder.Builder), "cloudstack": new(cloudstackbuilder.Builder), "digitalocean": new(digitaloceanbuilder.Builder), - "googlecompute": new(googlecomputebuilder.Builder), "hcloud": new(hcloudbuilder.Builder), "hyperv-iso": new(hypervisobuilder.Builder), "hyperv-vmcx": new(hypervvmcxbuilder.Builder), @@ -117,15 +113,13 @@ var VendoredProvisioners = map[string]packersdk.Provisioner{ // VendoredPostProcessors are post-processor components that were once bundled with the // Packer core, but are now being imported from their counterpart plugin repos var VendoredPostProcessors = map[string]packersdk.PostProcessor{ - "alicloud-import": new(alicloudimportpostprocessor.PostProcessor), - "digitalocean-import": new(digitaloceanimportpostprocessor.PostProcessor), - "googlecompute-export": new(googlecomputeexportpostprocessor.PostProcessor), - "googlecompute-import": new(googlecomputeimportpostprocessor.PostProcessor), - "ucloud-import": new(ucloudimportpostprocessor.PostProcessor), - "vagrant": new(vagrantpostprocessor.PostProcessor), - "vagrant-cloud": new(vagrantcloudpostprocessor.PostProcessor), - "yandex-export": new(yandexexportpostprocessor.PostProcessor), - "yandex-import": new(yandeximportpostprocessor.PostProcessor), + "alicloud-import": new(alicloudimportpostprocessor.PostProcessor), + "digitalocean-import": new(digitaloceanimportpostprocessor.PostProcessor), + "ucloud-import": new(ucloudimportpostprocessor.PostProcessor), + "vagrant": new(vagrantpostprocessor.PostProcessor), + "vagrant-cloud": new(vagrantcloudpostprocessor.PostProcessor), + "yandex-export": new(yandexexportpostprocessor.PostProcessor), + "yandex-import": new(yandeximportpostprocessor.PostProcessor), } // Upon init lets load up any plugins that were vendored manually into the default diff --git a/main.go b/main.go index 36fc965fe..77e53ad25 100644 --- a/main.go +++ b/main.go @@ -339,7 +339,8 @@ func loadConfig() (*config, error) { "docker": "github.com/hashicorp/docker", "exoscale": "github.com/exoscale/exoscale", - // "googlecompute": "github.com/hashicorp/googlecompute", + + "googlecompute": "github.com/hashicorp/googlecompute", "parallels-iso": "github.com/hashicorp/parallels", "parallels-pvm": "github.com/hashicorp/parallels", @@ -376,8 +377,8 @@ func loadConfig() (*config, error) { "docker-save": "github.com/hashicorp/docker", "docker-tag": "github.com/hashicorp/docker", - // "googlecompute-export": "github.com/hashicorp/googlecompute", - // "googlecompute-import": "github.com/hashicorp/googlecompute", + "googlecompute-export": "github.com/hashicorp/googlecompute", + "googlecompute-import": "github.com/hashicorp/googlecompute", "exoscale-import": "github.com/exoscale/exoscale", // "vagrant": "github.com/hashicorp/vagrant",