Habitat License Acceptance changes. These changes add a new argument that allows users to accept Habitat End User License.
This commit is contained in:
parent
11cf8fd6be
commit
e78658de4c
|
@ -11,6 +11,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"text/template"
|
"text/template"
|
||||||
|
|
||||||
|
version "github.com/hashicorp/go-version"
|
||||||
"github.com/hashicorp/terraform/communicator"
|
"github.com/hashicorp/terraform/communicator"
|
||||||
"github.com/hashicorp/terraform/communicator/remote"
|
"github.com/hashicorp/terraform/communicator/remote"
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
|
@ -60,6 +61,7 @@ type provisioner struct {
|
||||||
Organization string
|
Organization string
|
||||||
BuilderAuthToken string
|
BuilderAuthToken string
|
||||||
SupOptions string
|
SupOptions string
|
||||||
|
AcceptLicense bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func Provisioner() terraform.ResourceProvisioner {
|
func Provisioner() terraform.ResourceProvisioner {
|
||||||
|
@ -88,6 +90,10 @@ func Provisioner() terraform.ResourceProvisioner {
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Default: true,
|
Default: true,
|
||||||
},
|
},
|
||||||
|
"accept_license": &schema.Schema{
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
"permanent_peer": &schema.Schema{
|
"permanent_peer": &schema.Schema{
|
||||||
Type: schema.TypeBool,
|
Type: schema.TypeBool,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
|
@ -290,6 +296,26 @@ 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
|
// Validate service level configs
|
||||||
services, ok := c.Get("service")
|
services, ok := c.Get("service")
|
||||||
if ok {
|
if ok {
|
||||||
|
@ -351,6 +377,7 @@ func decodeConfig(d *schema.ResourceData) (*provisioner, error) {
|
||||||
Peer: d.Get("peer").(string),
|
Peer: d.Get("peer").(string),
|
||||||
Services: getServices(d.Get("service").(*schema.Set).List()),
|
Services: getServices(d.Get("service").(*schema.Set).List()),
|
||||||
UseSudo: d.Get("use_sudo").(bool),
|
UseSudo: d.Get("use_sudo").(bool),
|
||||||
|
AcceptLicense: d.Get("accept_license").(bool),
|
||||||
ServiceType: d.Get("service_type").(string),
|
ServiceType: d.Get("service_type").(string),
|
||||||
ServiceName: d.Get("service_name").(string),
|
ServiceName: d.Get("service_name").(string),
|
||||||
RingKey: d.Get("ring_key").(string),
|
RingKey: d.Get("ring_key").(string),
|
||||||
|
@ -461,6 +488,17 @@ func (p *provisioner) installHab(o terraform.UIOutput, comm communicator.Communi
|
||||||
return err
|
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 {
|
if err := p.createHabUser(o, comm); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -602,6 +640,7 @@ func (p *provisioner) createHabUser(o terraform.UIOutput, comm communicator.Comm
|
||||||
if p.UseSudo {
|
if p.UseSudo {
|
||||||
command = fmt.Sprintf("sudo %s", command)
|
command = fmt.Sprintf("sudo %s", command)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := p.runCommand(o, comm, command); err != nil {
|
if err := p.runCommand(o, comm, command); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ func TestResourceProvisioner_Validate_good(t *testing.T) {
|
||||||
"peer": "1.2.3.4",
|
"peer": "1.2.3.4",
|
||||||
"version": "0.32.0",
|
"version": "0.32.0",
|
||||||
"service_type": "systemd",
|
"service_type": "systemd",
|
||||||
|
"accept_license": false,
|
||||||
})
|
})
|
||||||
|
|
||||||
warn, errs := Provisioner().Validate(c)
|
warn, errs := Provisioner().Validate(c)
|
||||||
|
@ -43,13 +44,14 @@ func TestResourceProvisioner_Validate_bad(t *testing.T) {
|
||||||
if len(warn) > 0 {
|
if len(warn) > 0 {
|
||||||
t.Fatalf("Warnings: %v", warn)
|
t.Fatalf("Warnings: %v", warn)
|
||||||
}
|
}
|
||||||
if len(errs) != 1 {
|
if len(errs) != 2 {
|
||||||
t.Fatalf("Should have one error")
|
t.Fatalf("Should have two errors")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestResourceProvisioner_Validate_bad_service_config(t *testing.T) {
|
func TestResourceProvisioner_Validate_bad_service_config(t *testing.T) {
|
||||||
c := testConfig(t, map[string]interface{}{
|
c := testConfig(t, map[string]interface{}{
|
||||||
|
"accept_license": true,
|
||||||
"service": []map[string]interface{}{
|
"service": []map[string]interface{}{
|
||||||
map[string]interface{}{"name": "core/foo", "strategy": "bar", "topology": "baz", "url": "badurl"},
|
map[string]interface{}{"name": "core/foo", "strategy": "bar", "topology": "baz", "url": "badurl"},
|
||||||
},
|
},
|
||||||
|
|
|
@ -30,6 +30,7 @@ resource "aws_instance" "redis" {
|
||||||
peer = "${aws_instance.redis.0.private_ip}"
|
peer = "${aws_instance.redis.0.private_ip}"
|
||||||
use_sudo = true
|
use_sudo = true
|
||||||
service_type = "systemd"
|
service_type = "systemd"
|
||||||
|
accept_license = true
|
||||||
|
|
||||||
service {
|
service {
|
||||||
name = "core/redis"
|
name = "core/redis"
|
||||||
|
@ -46,6 +47,7 @@ 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.
|
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
|
### 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.
|
* `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`)
|
* `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`)
|
* `service_type (string)` - (Optional) Method used to run the Habitat supervisor. Valid options are `unmanaged` and `systemd`. (Defaults to `systemd`)
|
||||||
|
|
Loading…
Reference in New Issue