Launch instance body supports nested CreateVnicDetails, related parameter updates to Vnics and Subnets (#102)

* Launch instance body supports nested CreateVnicDetails, related parameter updates to Vnics and Subnets

* ipxeScript to launch instance
* adds ProhibitPublicIpOnVnic to subnet creation and HostnameLabel to vnic
* does not removed deprecated subnetId from top launch instance body yet
* create subnet optional routeTableId, securityListIds

* remove merge conflict artifacts

* ignore mac hidden files

Author: codycushing

.gitignore

@@ -40,3 +40,4 @@ crash.log
 terraform-encrypted-des.sh
 terraform-encrypted.sh
 terraform-plain.sh
+.DS_Store

data_source_obmcs_core_instance.go

@@ -65,6 +65,10 @@ func resourceCoreInstance() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"ipxe_script": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"metadata": {
 				Type:     schema.TypeMap,
 				Computed: true,
@@ -144,6 +148,7 @@ func (s *InstanceDatasourceCrud) SetData() {
 				"display_name":        v.DisplayName,
 				"id":                  v.ID,
 				"image":               v.ImageID,
+				"ipxe_script":         v.IpxeScript,
 				"metadata":            v.Metadata,
 				"region":              v.Region,
 				"shape":               v.Shape,

data_source_obmcs_core_subnet.go

@@ -80,6 +80,10 @@ func resourceCoreSubnets() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"prohibit_public_ip_on_vnic": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -154,10 +158,11 @@ func (s *SubnetDatasourceCrud) SetData() {
 				"security_list_ids":   v.SecurityListIDs,
 				"display_name":        v.DisplayName,
 				"id":                  v.ID,
-				"state":               v.State,
-				"time_created":        v.TimeCreated.String(),
-				"virtual_router_ip":   v.VirtualRouterIP,
-				"virtual_router_mac":  v.VirtualRouterMac,
+				"prohibit_public_ip_on_vnic": v.ProhibitPublicIpOnVnic,
+				"state":              v.State,
+				"time_created":       v.TimeCreated.String(),
+				"virtual_router_ip":  v.VirtualRouterIP,
+				"virtual_router_mac": v.VirtualRouterMac,
 			}
 			resources = append(resources, res)
 		}

data_source_obmcs_core_vnic.go

@@ -34,6 +34,10 @@ func VnicDatasource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"hostname_label": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -81,6 +85,7 @@ func (v *VnicDatasourceCrud) SetData() {
 		v.D.Set("availability_domain", v.Resource.AvailabilityDomain)
 		v.D.Set("compartment_id", v.Resource.CompartmentID)
 		v.D.Set("display_name", v.Resource.DisplayName)
+		v.D.Set("hostname_label", v.Resource.HostnameLabel)
 		v.D.Set("state", v.Resource.State)
 		v.D.Set("private_ip_address", v.Resource.PrivateIPAddress)
 		v.D.Set("public_ip_address", v.Resource.PublicIPAddress)

docs/datasources/core/subnet.md

@@ -35,6 +35,7 @@ The following attributes are exported:
 * `security_list_ids` - OCIDs for the security lists to use for VNICs in this subnet.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable.
 * `id` - The subnet's Oracle ID (OCID).
+* `prohibit_public_ip_on_vnic` - Whether VNICs within this subnet can have public IP addresses.
 * `vcn_id` - The OCID of the VCN the subnet is in.
 * `state` - The VCN's current state. [PROVISIONING, AVAILABLE, TERMINATING, TERMINATED]
 * `time_created` - The date and time the VCN was created.

docs/datasources/core/vnic.md

@@ -24,6 +24,7 @@ The following attributes are exported:
 * `availability_domain` - The VNIC's Availability Domain.
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the VNIC.
+* `hostname_label` - The hostname for the VNIC that is created during instance launch. Used for DNS. .
 * `state` - The current state of the VNIC. [PROVISIONING, AVAILABLE, TERMINATING, TERMINATED]
 * `private_ip_address` - The private IP addresses of the VNIC, which is within the VNIC subnet and is accessible within the VCN.
 * `public_ip_address` - The public IP address of the VNIC, which Oracle performs NAT for at the gateway.

docs/resources/core/subnet.md

@@ -13,6 +13,7 @@ resource "baremetal_core_subnet" "t" {
     route_table_id = "routetableid"
     vcn_id = "vcnid"
     security_list_ids = ["slid1", "slid2"]
+    prohibit_public_ip_on_vnic = true
 }
 ```
 
@@ -26,6 +27,7 @@ The following arguments are supported:
 * `vcn_id` - (Required) The OCID of the VCN to contain the subnet.
 * `dhcp_options_id` - (Optional) The OCID of the set of DHCP options the subnet will use. If you don't provide a value, the subnet will use the VCN's default set of DHCP options.
 * `display_name` - (Optional) The maximum number of items to return in a paginated "List" call.
+* `prohibit_public_ip_on_vnic` - (Optional) Whether VNICs within this subnet can have public IP. If it is allowed, VNICs created in the subnet will automatically be assigned public IP unless otherwise specified in the VNIC. If it is prohibited, VNICs in the subnet cannot have public IP address assigned. The default value is false if unspecified.
 * `route_table_id` - (Optional) The OCID of the route table the subnet will use. If you don't provide a value, the subnet will use the VCN's default route table.
 * `security_list_ids` - (Optional) OCIDs for the security lists to associate with the subnet. If you don't provide a value, the VCN's default security list will be associated with the subnet. Remember that security lists are associated at the subnet level, but the rules are applied to the individual VNICs in the subnet.
 
@@ -41,6 +43,7 @@ The following arguments are supported:
 * `security_list_ids` - OCIDs for the security lists to use for VNICs in this subnet.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable.
 * `id` - The subnet's Oracle ID (OCID).
+* `prohibit_public_ip_on_vnic` - Whether VNICs within this subnet can have public IPs. If it is allowed, VNICs created in the subnet will automatically be assigned public IP unless otherwise specified in the VNIC. If it is prohibited, VNICs in the subnet cannot have public IP address assigned. The default value is false if unspecified.
 * `vcn_id` - The OCID of the VCN the subnet is in.
 * `state` - The VCN's current state. [PROVISIONING, AVAILABLE, TERMINATING, TERMINATED]
 * `time_created` - The date and time the VCN was created.

resource_obmcs_core_instance.go

@@ -28,6 +28,34 @@ func InstanceResource() *schema.Resource {
 		Update: updateInstance,
 		Delete: deleteInstance,
 		Schema: map[string]*schema.Schema{
+			"create_vnic_details": &schema.Schema{
+				Type:     schema.TypeMap,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"assign_public_ip": {
+							Type:     schema.TypeBool,
+							Optional: true,
+						},
+						"display_name": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"hostname_label": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"private_ip": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"subnet_id": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
 			"availability_domain": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -57,6 +85,10 @@ func InstanceResource() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"ipxe_script": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"metadata": {
 				Type:     schema.TypeMap,
 				Required: true,
@@ -181,12 +213,46 @@ func (s *InstanceResourceCrud) Create() (e error) {
 	if hostnameLabel, ok := s.D.GetOk("hostname_label"); ok {
 		opts.HostnameLabel = hostnameLabel.(string)
 	}
+	if ipxeScript, ok := s.D.GetOk("ipxe_script"); ok {
+		opts.IpxeScript = ipxeScript.(string)
+	}
 
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
 		metadata := resourceInstanceMapToMetadata(rawMetadata.(map[string]interface{}))
 		opts.Metadata = metadata
 	}
 
+	if rawVnic, ok := s.D.GetOk("create_vnic_details"); ok {
+		vnic := rawVnic.(map[string]interface{})
+
+		vnicOpts := &baremetal.CreateVnicOptions{}
+		vnicOpts.SubnetID = vnic["subnet_id"].(string)
+
+		displayName := vnic["display_name"]
+		if displayName != nil {
+			vnicOpts.DisplayName = displayName.(string)
+		}
+
+		hostnameLabel := vnic["hostname_label"]
+		if hostnameLabel != nil {
+			vnicOpts.HostnameLabel = hostnameLabel.(string)
+		}
+
+		privateIp := vnic["private_ip"]
+		if privateIp != nil {
+			vnicOpts.PrivateIp = privateIp.(string)
+		}
+
+		//todo: work around for tf bug https://github.com/hashicorp/terraform/issues/13512
+		assignPublicIp := vnic["assign_public_ip"]
+		if assignPublicIp != nil {
+			vnicOpts.AssignPublicIp = new(bool)
+			*vnicOpts.AssignPublicIp = assignPublicIp.(string) == "1"
+		}
+
+		opts.CreateVnicOptions = vnicOpts
+	}
+
 	s.Resource, e = s.Client.LaunchInstance(
 		availabilityDomain,
 		compartmentID,
@@ -284,6 +350,7 @@ func (s *InstanceResourceCrud) SetData() {
 	s.D.Set("compartment_id", s.Resource.CompartmentID)
 	s.D.Set("display_name", s.Resource.DisplayName)
 	s.D.Set("image", s.Resource.ImageID)
+	s.D.Set("ipxe_script", s.Resource.IpxeScript)
 	s.D.Set("metadata", s.Resource.Metadata)
 	s.D.Set("region", s.Resource.Region)
 	s.D.Set("shape", s.Resource.Shape)

resource_obmcs_core_subnet.go

@@ -40,7 +40,7 @@ func SubnetResource() *schema.Resource {
 			},
 			"route_table_id": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
 			},
 			"vcn_id": {
@@ -50,7 +50,7 @@ func SubnetResource() *schema.Resource {
 			},
 			"security_list_ids": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
 				Set:      schema.HashString,
 				Elem: &schema.Schema{
@@ -76,6 +76,10 @@ func SubnetResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"prohibit_public_ip_on_vnic": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -176,6 +180,11 @@ func (s *SubnetResourceCrud) Create() (e error) {
 		opts.DNSLabel = dnsLabel.(string)
 	}
 
+	prohibitPublicIpOnVnic, ok := s.D.GetOk("prohibit_public_ip_on_vnic")
+	if ok {
+		opts.ProhibitPublicIpOnVnic = prohibitPublicIpOnVnic.(bool)
+	}
+
 	if rawSecurityListIDs, ok := s.D.GetOk("security_list_ids"); ok {
 		securityListIDs := []string{}
 		for _, val := range rawSecurityListIDs.(*schema.Set).List() {