diff --git a/command/vendored_plugins.go b/command/vendored_plugins.go index cad411658..719ee0c29 100644 --- a/command/vendored_plugins.go +++ b/command/vendored_plugins.go @@ -9,14 +9,6 @@ import ( alicloudecsbuilder "github.com/hashicorp/packer-plugin-alicloud/builder/ecs" alicloudimportpostprocessor "github.com/hashicorp/packer-plugin-alicloud/post-processor/alicloud-import" - amazonchrootbuilder "github.com/hashicorp/packer-plugin-amazon/builder/chroot" - amazonebsbuilder "github.com/hashicorp/packer-plugin-amazon/builder/ebs" - amazonebssurrogatebuilder "github.com/hashicorp/packer-plugin-amazon/builder/ebssurrogate" - amazonebsvolumebuilder "github.com/hashicorp/packer-plugin-amazon/builder/ebsvolume" - amazoninstancebuilder "github.com/hashicorp/packer-plugin-amazon/builder/instance" - amazonamidatasource "github.com/hashicorp/packer-plugin-amazon/datasource/ami" - amazonsecretsmanagerdatasource "github.com/hashicorp/packer-plugin-amazon/datasource/secretsmanager" - anazibimportpostprocessor "github.com/hashicorp/packer-plugin-amazon/post-processor/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" @@ -88,64 +80,56 @@ import ( // VendoredDatasources are datasource components that were once bundled with the // Packer core, but are now being imported from their counterpart plugin repos -var VendoredDatasources = map[string]packersdk.Datasource{ - "amazon-ami": new(amazonamidatasource.Datasource), - "amazon-secretsmanager": new(amazonsecretsmanagerdatasource.Datasource), -} +var VendoredDatasources = map[string]packersdk.Datasource{} // VendoredBuilders are builder components that were once bundled with the // Packer core, but are now being imported from their counterpart plugin repos var VendoredBuilders = map[string]packersdk.Builder{ - "alicloud-ecs": new(alicloudecsbuilder.Builder), - "amazon-ebs": new(amazonebsbuilder.Builder), - "amazon-chroot": new(amazonchrootbuilder.Builder), - "amazon-ebssurrogate": new(amazonebssurrogatebuilder.Builder), - "amazon-ebsvolume": new(amazonebsvolumebuilder.Builder), - "amazon-instance": new(amazoninstancebuilder.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), - "googlecompute": new(googlecomputebuilder.Builder), - "hcloud": new(hcloudbuilder.Builder), - "hyperv-iso": new(hypervisobuilder.Builder), - "hyperv-vmcx": new(hypervvmcxbuilder.Builder), - "hyperone": new(hyperonebuilder.Builder), - "jdcloud": new(jdcloudbuilder.Builder), - "linode": new(linodebuilder.Builder), - "lxc": new(lxcbuilder.Builder), - "lxd": new(lxdbuilder.Builder), - "ncloud": new(ncloudbuilder.Builder), - "oneandone": new(oneandonebuilder.Builder), - "openstack": new(openstackbuilder.Builder), - "oracle-classic": new(oracleclassicbuilder.Builder), - "oracle-oci": new(oracleocibuilder.Builder), - "profitbricks": new(profitbricksbuilder.Builder), - "proxmox": new(proxmoxiso.Builder), - "proxmox-iso": new(proxmoxiso.Builder), - "proxmox-clone": new(proxmoxclone.Builder), - "parallels-iso": new(parallelsisobuilder.Builder), - "parallels-pvm": new(parallelspvmbuilder.Builder), - "qemu": new(qemubuilder.Builder), - "scaleway": new(scalewaybuilder.Builder), - "tencentcloud-cvm": new(tencentcloudcvmbuilder.Builder), - "triton": new(tritonbuilder.Builder), - "ucloud-uhost": new(uclouduhostbuilder.Builder), - "vagrant": new(vagrantbuilder.Builder), - "vsphere-clone": new(vsphereclonebuilder.Builder), - "vsphere-iso": new(vsphereisobuilder.Builder), - "virtualbox-iso": new(virtualboxisobuilder.Builder), - "virtualbox-ovf": new(virtualboxovfbuilder.Builder), - "virtualbox-vm": new(virtualboxvmbuilder.Builder), - "vmware-iso": new(vmwareisobuilder.Builder), - "vmware-vmx": new(vmwarevmxbuilder.Builder), - "osc-bsu": new(oscbsubuilder.Builder), - "osc-bsusurrogate": new(oscbsusurrogatebuilder.Builder), - "osc-bsuvolume": new(oscbsuvolumebuilder.Builder), - "osc-chroot": new(oscchrootbuilder.Builder), - "yandex": new(yandexbuilder.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), + "googlecompute": new(googlecomputebuilder.Builder), + "hcloud": new(hcloudbuilder.Builder), + "hyperv-iso": new(hypervisobuilder.Builder), + "hyperv-vmcx": new(hypervvmcxbuilder.Builder), + "hyperone": new(hyperonebuilder.Builder), + "jdcloud": new(jdcloudbuilder.Builder), + "linode": new(linodebuilder.Builder), + "lxc": new(lxcbuilder.Builder), + "lxd": new(lxdbuilder.Builder), + "ncloud": new(ncloudbuilder.Builder), + "oneandone": new(oneandonebuilder.Builder), + "openstack": new(openstackbuilder.Builder), + "oracle-classic": new(oracleclassicbuilder.Builder), + "oracle-oci": new(oracleocibuilder.Builder), + "profitbricks": new(profitbricksbuilder.Builder), + "proxmox": new(proxmoxiso.Builder), + "proxmox-iso": new(proxmoxiso.Builder), + "proxmox-clone": new(proxmoxclone.Builder), + "parallels-iso": new(parallelsisobuilder.Builder), + "parallels-pvm": new(parallelspvmbuilder.Builder), + "qemu": new(qemubuilder.Builder), + "scaleway": new(scalewaybuilder.Builder), + "tencentcloud-cvm": new(tencentcloudcvmbuilder.Builder), + "triton": new(tritonbuilder.Builder), + "ucloud-uhost": new(uclouduhostbuilder.Builder), + "vagrant": new(vagrantbuilder.Builder), + "vsphere-clone": new(vsphereclonebuilder.Builder), + "vsphere-iso": new(vsphereisobuilder.Builder), + "virtualbox-iso": new(virtualboxisobuilder.Builder), + "virtualbox-ovf": new(virtualboxovfbuilder.Builder), + "virtualbox-vm": new(virtualboxvmbuilder.Builder), + "vmware-iso": new(vmwareisobuilder.Builder), + "vmware-vmx": new(vmwarevmxbuilder.Builder), + "osc-bsu": new(oscbsubuilder.Builder), + "osc-bsusurrogate": new(oscbsusurrogatebuilder.Builder), + "osc-bsuvolume": new(oscbsuvolumebuilder.Builder), + "osc-chroot": new(oscchrootbuilder.Builder), + "yandex": new(yandexbuilder.Builder), } // VendoredProvisioners are provisioner components that were once bundled with the @@ -167,7 +151,6 @@ var VendoredProvisioners = map[string]packersdk.Provisioner{ // Packer core, but are now being imported from their counterpart plugin repos var VendoredPostProcessors = map[string]packersdk.PostProcessor{ "alicloud-import": new(alicloudimportpostprocessor.PostProcessor), - "amazon-import": new(anazibimportpostprocessor.PostProcessor), "digitalocean-import": new(digitaloceanimportpostprocessor.PostProcessor), "docker-import": new(dockerimportpostprocessor.PostProcessor), "docker-push": new(dockerpushpostprocessor.PostProcessor), diff --git a/main.go b/main.go index 2a6821bbd..68ac11724 100644 --- a/main.go +++ b/main.go @@ -326,11 +326,11 @@ func loadConfig() (*config, error) { // BuilderRedirects BuilderRedirects: map[string]string{ - // "amazon-chroot": "github.com/hashicorp/amazon", - // "amazon-ebs": "github.com/hashicorp/amazon", - // "amazon-ebssurrogate": "github.com/hashicorp/amazon", - // "amazon-ebsvolume": "github.com/hashicorp/amazon", - // "amazon-instance": "github.com/hashicorp/amazon", + "amazon-chroot": "github.com/hashicorp/amazon", + "amazon-ebs": "github.com/hashicorp/amazon", + "amazon-ebssurrogate": "github.com/hashicorp/amazon", + "amazon-ebsvolume": "github.com/hashicorp/amazon", + "amazon-instance": "github.com/hashicorp/amazon", // "azure-arm": "github.com/hashicorp/azure", // "azure-chroot": "github.com/hashicorp/azure", @@ -359,7 +359,8 @@ func loadConfig() (*config, error) { // "vsphere-clone": "github.com/hashicorp/vsphere", }, DatasourceRedirects: map[string]string{ - // "amazon-ami": "github.com/hashicorp/amazon", + "amazon-ami": "github.com/hashicorp/amazon", + "amazon-secretsmanager": "github.com/hashicorp/amazon", }, ProvisionerRedirects: map[string]string{ // "ansible": "github.com/hashicorp/ansible", @@ -368,7 +369,7 @@ func loadConfig() (*config, error) { // "azure-dtlartifact": "github.com/hashicorp/azure", }, PostProcessorRedirects: map[string]string{ - // "amazon-import": "github.com/hashicorp/amazon", + "amazon-import": "github.com/hashicorp/amazon", // "docker-import": "github.com/hashicorp/docker", // "docker-push": "github.com/hashicorp/docker",