Skip to content

Commit

Permalink
remove azure plugin from bundled plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
azr committed Nov 3, 2021
1 parent bb33cf9 commit 37ac5b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
8 changes: 0 additions & 8 deletions command/vendored_plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 37ac5b2

Please sign in to comment.