From 37ac5b260f52f7a1e3c0e3b6f04920832992c10a Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 3 Nov 2021 11:36:41 +0100 Subject: [PATCH] remove azure plugin from bundled plugins --- command/vendored_plugins.go | 8 -------- main.go | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/command/vendored_plugins.go b/command/vendored_plugins.go index 719ee0c29..2f04f7a44 100644 --- a/command/vendored_plugins.go +++ b/command/vendored_plugins.go @@ -11,10 +11,6 @@ import ( alicloudimportpostprocessor "github.com/hashicorp/packer-plugin-alicloud/post-processor/alicloud-import" ansibleprovisioner "github.com/hashicorp/packer-plugin-ansible/provisioner/ansible" ansiblelocalprovisioner "github.com/hashicorp/packer-plugin-ansible/provisioner/ansible-local" - azurearmbuilder "github.com/hashicorp/packer-plugin-azure/builder/azure/arm" - azurechrootbuilder "github.com/hashicorp/packer-plugin-azure/builder/azure/chroot" - azuredtlbuilder "github.com/hashicorp/packer-plugin-azure/builder/azure/dtl" - azuredtlartifactprovisioner "github.com/hashicorp/packer-plugin-azure/provisioner/azure-dtlartifact" chefclientprovisioner "github.com/hashicorp/packer-plugin-chef/provisioner/chef-client" chefsoloprovisioner "github.com/hashicorp/packer-plugin-chef/provisioner/chef-solo" cloudstackbuilder "github.com/hashicorp/packer-plugin-cloudstack/builder/cloudstack" @@ -86,9 +82,6 @@ var VendoredDatasources = map[string]packersdk.Datasource{} // Packer core, but are now being imported from their counterpart plugin repos var VendoredBuilders = map[string]packersdk.Builder{ "alicloud-ecs": new(alicloudecsbuilder.Builder), - "azure-arm": new(azurearmbuilder.Builder), - "azure-chroot": new(azurechrootbuilder.Builder), - "azure-dtl": new(azuredtlbuilder.Builder), "cloudstack": new(cloudstackbuilder.Builder), "digitalocean": new(digitaloceanbuilder.Builder), "docker": new(dockerbuilder.Builder), @@ -135,7 +128,6 @@ var VendoredBuilders = map[string]packersdk.Builder{ // VendoredProvisioners are provisioner components that were once bundled with the // Packer core, but are now being imported from their counterpart plugin repos var VendoredProvisioners = map[string]packersdk.Provisioner{ - "azure-dtlartifact": new(azuredtlartifactprovisioner.Provisioner), "ansible": new(ansibleprovisioner.Provisioner), "ansible-local": new(ansiblelocalprovisioner.Provisioner), "chef-client": new(chefclientprovisioner.Provisioner), diff --git a/main.go b/main.go index 68ac11724..0ef38b5dd 100644 --- a/main.go +++ b/main.go @@ -332,9 +332,9 @@ func loadConfig() (*config, error) { "amazon-ebsvolume": "github.com/hashicorp/amazon", "amazon-instance": "github.com/hashicorp/amazon", - // "azure-arm": "github.com/hashicorp/azure", - // "azure-chroot": "github.com/hashicorp/azure", - // "dtl": "github.com/hashicorp/azure", + "azure-arm": "github.com/hashicorp/azure", + "azure-chroot": "github.com/hashicorp/azure", + "azure-dtl": "github.com/hashicorp/azure", // "docker": "github.com/hashicorp/docker", @@ -366,7 +366,7 @@ func loadConfig() (*config, error) { // "ansible": "github.com/hashicorp/ansible", // "ansible-local": "github.com/hashicorp/ansible", - // "azure-dtlartifact": "github.com/hashicorp/azure", + "azure-dtlartifact": "github.com/hashicorp/azure", }, PostProcessorRedirects: map[string]string{ "amazon-import": "github.com/hashicorp/amazon",