From 291cf8c5a4422dbcf993fc391197315c9489b3e8 Mon Sep 17 00:00:00 2001 From: Pam Selle Date: Mon, 5 Aug 2019 12:43:55 -0400 Subject: [PATCH] Revert "Habitat License Acceptance changes. " --- .../habitat/resource_provisioner.go | 39 ------------------- .../habitat/resource_provisioner_test.go | 13 +++---- website/docs/provisioners/chef.html.markdown | 3 -- .../docs/provisioners/habitat.html.markdown | 2 - 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/builtin/provisioners/habitat/resource_provisioner.go b/builtin/provisioners/habitat/resource_provisioner.go index c71d35bb1..26691db5a 100644 --- a/builtin/provisioners/habitat/resource_provisioner.go +++ b/builtin/provisioners/habitat/resource_provisioner.go @@ -11,7 +11,6 @@ import ( "strings" "text/template" - version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator/remote" "github.com/hashicorp/terraform/helper/schema" @@ -61,7 +60,6 @@ type provisioner struct { Organization string BuilderAuthToken string SupOptions string - AcceptLicense bool } func Provisioner() terraform.ResourceProvisioner { @@ -90,10 +88,6 @@ func Provisioner() terraform.ResourceProvisioner { Optional: true, Default: true, }, - "accept_license": &schema.Schema{ - Type: schema.TypeBool, - Required: true, - }, "permanent_peer": &schema.Schema{ Type: schema.TypeBool, Optional: true, @@ -296,26 +290,6 @@ func validateFn(c *terraform.ResourceConfig) (ws []string, es []error) { } } - v, ok := c.Get("version") - if ok && v != nil && strings.TrimSpace(v.(string)) != "" { - if _, err := version.NewVersion(v.(string)); err != nil { - es = append(es, errors.New(v.(string)+" is not a valid version.")) - } - } - - acceptLicense, ok := c.Get("accept_license") - if ok && !acceptLicense.(bool) { - if v != nil && strings.TrimSpace(v.(string)) != "" { - versionOld, _ := version.NewVersion("0.79.0") - versionRequired, _ := version.NewVersion(v.(string)) - if versionRequired.GreaterThan(versionOld) { - es = append(es, errors.New("Habitat end user license agreement needs to be accepted, set the accept_license argument to true to accept")) - } - } else { // blank means latest version - es = append(es, errors.New("Habitat end user license agreement needs to be accepted, set the accept_license argument to true to accept")) - } - } - // Validate service level configs services, ok := c.Get("service") if ok { @@ -377,7 +351,6 @@ func decodeConfig(d *schema.ResourceData) (*provisioner, error) { Peer: d.Get("peer").(string), Services: getServices(d.Get("service").(*schema.Set).List()), UseSudo: d.Get("use_sudo").(bool), - AcceptLicense: d.Get("accept_license").(bool), ServiceType: d.Get("service_type").(string), ServiceName: d.Get("service_name").(string), RingKey: d.Get("ring_key").(string), @@ -488,17 +461,6 @@ func (p *provisioner) installHab(o terraform.UIOutput, comm communicator.Communi return err } - // Accept the license - if p.AcceptLicense { - command = fmt.Sprintf("export HAB_LICENSE=accept; hab -V") - if p.UseSudo { - command = fmt.Sprintf("sudo HAB_LICENSE=accept hab -V") - } - if err := p.runCommand(o, comm, command); err != nil { - return err - } - } - if err := p.createHabUser(o, comm); err != nil { return err } @@ -640,7 +602,6 @@ func (p *provisioner) createHabUser(o terraform.UIOutput, comm communicator.Comm if p.UseSudo { command = fmt.Sprintf("sudo %s", command) } - if err := p.runCommand(o, comm, command); err != nil { return err } diff --git a/builtin/provisioners/habitat/resource_provisioner_test.go b/builtin/provisioners/habitat/resource_provisioner_test.go index 317b77ad4..6942b08a4 100644 --- a/builtin/provisioners/habitat/resource_provisioner_test.go +++ b/builtin/provisioners/habitat/resource_provisioner_test.go @@ -20,10 +20,9 @@ func TestProvisioner(t *testing.T) { func TestResourceProvisioner_Validate_good(t *testing.T) { c := testConfig(t, map[string]interface{}{ - "peer": "1.2.3.4", - "version": "0.32.0", - "service_type": "systemd", - "accept_license": false, + "peer": "1.2.3.4", + "version": "0.32.0", + "service_type": "systemd", }) warn, errs := Provisioner().Validate(c) @@ -44,15 +43,13 @@ func TestResourceProvisioner_Validate_bad(t *testing.T) { if len(warn) > 0 { t.Fatalf("Warnings: %v", warn) } - //Two errors, one for service_type, other for missing required accept_license argument - if len(errs) != 2 { - t.Fatalf("Should have two errors") + if len(errs) != 1 { + t.Fatalf("Should have one error") } } func TestResourceProvisioner_Validate_bad_service_config(t *testing.T) { c := testConfig(t, map[string]interface{}{ - "accept_license": true, "service": []map[string]interface{}{ map[string]interface{}{"name": "core/foo", "strategy": "bar", "topology": "baz", "url": "badurl"}, }, diff --git a/website/docs/provisioners/chef.html.markdown b/website/docs/provisioners/chef.html.markdown index 3dbb5b70e..67c34b59a 100644 --- a/website/docs/provisioners/chef.html.markdown +++ b/website/docs/provisioners/chef.html.markdown @@ -19,8 +19,6 @@ The `chef` provisioner has some prerequisites for specific connection types: * For `ssh` type connections, `cURL` must be available on the remote host. * For `winrm` connections, `PowerShell 2.0` must be available on the remote host. -[Chef end user license agreement](https://www.chef.io/end-user-license-agreement/) must be accepted by setting `chef_license` to `accept` in `client_options` argument unless you are installing an old version of Chef client. - Without these prerequisites, your provisioning execution will fail. ## Example usage @@ -45,7 +43,6 @@ resource "aws_instance" "web" { EOF environment = "_default" - client_options = ["chef_license 'accept'"] run_list = ["cookbook::recipe"] node_name = "webserver1" secret_key = "${file("../encrypted_data_bag_secret")}" diff --git a/website/docs/provisioners/habitat.html.markdown b/website/docs/provisioners/habitat.html.markdown index beb0fb3b1..f96239b8e 100644 --- a/website/docs/provisioners/habitat.html.markdown +++ b/website/docs/provisioners/habitat.html.markdown @@ -30,7 +30,6 @@ resource "aws_instance" "redis" { peer = "${aws_instance.redis.0.private_ip}" use_sudo = true service_type = "systemd" - accept_license = true service { name = "core/redis" @@ -47,7 +46,6 @@ resource "aws_instance" "redis" { There are 2 configuration levels, `supervisor` and `service`. Configuration placed directly within the `provisioner` block are supervisor configurations, and a provisioner can define zero or more services to run, and each service will have a `service` block within the `provisioner`. A `service` block can also contain zero or more `bind` blocks to create service group bindings. ### Supervisor Arguments -* `accept_license (bool)` - (Required) Set to true to accept [Habitat end user license agreement](https://www.chef.io/end-user-license-agreement/) * `version (string)` - (Optional) The Habitat version to install on the remote machine. If not specified, the latest available version is used. * `use_sudo (bool)` - (Optional) Use `sudo` when executing remote commands. Required when the user specified in the `connection` block is not `root`. (Defaults to `true`) * `service_type (string)` - (Optional) Method used to run the Habitat supervisor. Valid options are `unmanaged` and `systemd`. (Defaults to `systemd`)