-
Notifications
You must be signed in to change notification settings - Fork 134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add resource & data source instance #696
Open
Tiboau
wants to merge
3
commits into
ovh:master
Choose a base branch
from
Tiboau:resource_cloud_project_instance.go
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,150 @@ | ||
package ovh | ||
|
||
import ( | ||
"fmt" | ||
"log" | ||
"net/url" | ||
|
||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
"github.com/ovh/terraform-provider-ovh/ovh/helpers" | ||
) | ||
|
||
func dataSourceCloudProjectInstance() *schema.Resource { | ||
return &schema.Resource{ | ||
Read: dataSourceCloudProjectInstanceRead, | ||
Schema: map[string]*schema.Schema{ | ||
"service_name": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
DefaultFunc: schema.EnvDefaultFunc("OVH_CLOUD_PROJECT_SERVICE", nil), | ||
Description: "Service name of the resource representing the id of the cloud project.", | ||
}, | ||
"region": { | ||
Type: schema.TypeString, | ||
Description: "Instance region", | ||
Required: true, | ||
}, | ||
"instance_id": { | ||
Type: schema.TypeString, | ||
Description: "Instance id", | ||
Required: true, | ||
}, | ||
// computed | ||
"addresses": { | ||
Type: schema.TypeSet, | ||
Computed: true, | ||
Description: "Instance IP addresses", | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"ip": { | ||
Type: schema.TypeString, | ||
Description: "IP address", | ||
Computed: true, | ||
}, | ||
"version": { | ||
Type: schema.TypeInt, | ||
Description: "IP version", | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"attached_volumes": { | ||
Type: schema.TypeSet, | ||
Computed: true, | ||
Description: "Volumes attached to the instance", | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"id": { | ||
Type: schema.TypeString, | ||
Description: "Volume Id", | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"flavor_id": { | ||
Type: schema.TypeString, | ||
Description: "Flavor id", | ||
Computed: true, | ||
}, | ||
"flavor_name": { | ||
Type: schema.TypeString, | ||
Description: "Flavor name", | ||
Computed: true, | ||
}, | ||
"name": { | ||
Type: schema.TypeString, | ||
Description: "Flavor name", | ||
Computed: true, | ||
}, | ||
"id": { | ||
Type: schema.TypeString, | ||
Description: "Instance id", | ||
Computed: true, | ||
}, | ||
"image_id": { | ||
Type: schema.TypeString, | ||
Description: "Image id", | ||
Computed: true, | ||
}, | ||
"ssh_key": { | ||
Type: schema.TypeString, | ||
Description: "Instance task state", | ||
Computed: true, | ||
}, | ||
"task_state": { | ||
Type: schema.TypeString, | ||
Description: "Instance task state", | ||
Computed: true, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func dataSourceCloudProjectInstanceRead(d *schema.ResourceData, meta interface{}) error { | ||
config := meta.(*Config) | ||
serviceName := d.Get("service_name").(string) | ||
region := d.Get("region").(string) | ||
instanceId := d.Get("instance_id").(string) | ||
|
||
endpoint := fmt.Sprintf("/cloud/project/%s/region/%s/instance/%s", | ||
url.PathEscape(serviceName), | ||
url.PathEscape(region), | ||
url.PathEscape(instanceId), | ||
) | ||
var res CloudProjectInstanceResponse | ||
|
||
log.Printf("[DEBUG] Will read instance %s from project %s in region %s", instanceId, serviceName, region) | ||
if err := config.OVHClient.Get(endpoint, &res); err != nil { | ||
return helpers.CheckDeleted(d, err, endpoint) | ||
} | ||
log.Printf("[DEBUG] Read instance: %+v", res) | ||
|
||
addresses := make([]map[string]interface{}, 0) | ||
for i := range res.Addresses { | ||
address := make(map[string]interface{}) | ||
address["ip"] = res.Addresses[i].Ip | ||
address["version"] = res.Addresses[i].Version | ||
addresses = append(addresses, address) | ||
} | ||
|
||
attachedVolumes := make([]map[string]interface{}, 0) | ||
for i := range res.AttachedVolumes { | ||
attachedVolume := make(map[string]interface{}) | ||
attachedVolume["id"] = res.AttachedVolumes[i].Id | ||
attachedVolumes = append(attachedVolumes, attachedVolume) | ||
} | ||
|
||
d.Set("addresses", addresses) | ||
d.Set("flavor_id", res.FlavorId) | ||
d.Set("flavor_name", res.FlavorName) | ||
d.SetId(res.Id) | ||
d.Set("image_id", res.ImageId) | ||
d.Set("instance_id", res.Id) | ||
d.Set("name", res.Name) | ||
d.Set("ssh_key", res.SshKey) | ||
d.Set("task_state", res.TaskState) | ||
|
||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package ovh | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
"testing" | ||
|
||
"github.com/hashicorp/terraform-plugin-testing/helper/resource" | ||
) | ||
|
||
func TestAccDataSourceCloudProjecInstance_basic(t *testing.T) { | ||
|
||
config := fmt.Sprintf( | ||
testAccDataSourceCloudProjectInstance, | ||
os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST"), | ||
os.Getenv("OVH_CLOUD_PROJECT_REGION_TEST"), | ||
os.Getenv("OVH_CLOUD_PROJECT_INSTANCE_ID_TEST"), | ||
) | ||
|
||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { | ||
testAccPreCheckCloud(t) | ||
testAccCheckCloudProjectExists(t) | ||
}, | ||
|
||
Providers: testAccProviders, | ||
Steps: []resource.TestStep{ | ||
{ | ||
Config: config, | ||
Check: resource.ComposeTestCheckFunc( | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "flavor_name"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "flavor_id"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "id"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "image_id"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "name"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "ssh_key"), | ||
resource.TestCheckResourceAttrSet("data.ovh_cloud_project_instance.test", "region"), | ||
), | ||
}, | ||
}, | ||
}) | ||
} | ||
|
||
var testAccDataSourceCloudProjectInstance = ` | ||
data "ovh_cloud_project_instance" "test" { | ||
service_name = "%s" | ||
region = "%s" | ||
instance_id = "%s" | ||
} | ||
` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
package ovh | ||
|
||
import ( | ||
"fmt" | ||
"log" | ||
"net/url" | ||
"sort" | ||
|
||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
"github.com/ovh/terraform-provider-ovh/ovh/helpers" | ||
"github.com/ovh/terraform-provider-ovh/ovh/helpers/hashcode" | ||
) | ||
|
||
func dataSourceCloudProjectInstances() *schema.Resource { | ||
return &schema.Resource{ | ||
Read: dataSourceCloudProjectInstancesRead, | ||
Schema: map[string]*schema.Schema{ | ||
"service_name": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
DefaultFunc: schema.EnvDefaultFunc("OVH_CLOUD_PROJECT_SERVICE", nil), | ||
Description: "Service name of the resource representing the id of the cloud project.", | ||
}, | ||
"region": { | ||
Type: schema.TypeString, | ||
Description: "Instance region", | ||
Required: true, | ||
}, | ||
// computed | ||
"instances": { | ||
Type: schema.TypeList, | ||
Description: "List of instances", | ||
Computed: true, | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"addresses": { | ||
Type: schema.TypeSet, | ||
Computed: true, | ||
Description: "Instance IP addresses", | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"ip": { | ||
Type: schema.TypeString, | ||
Description: "IP address", | ||
Computed: true, | ||
}, | ||
"version": { | ||
Type: schema.TypeInt, | ||
Description: "IP version", | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"attached_volumes": { | ||
Type: schema.TypeList, | ||
Computed: true, | ||
Description: " Volumes attached to the instance", | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"id": { | ||
Type: schema.TypeString, | ||
Description: "Volume Id", | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"flavor_id": { | ||
Type: schema.TypeString, | ||
Description: "Flavor id", | ||
Computed: true, | ||
}, | ||
"flavor_name": { | ||
Type: schema.TypeString, | ||
Description: "Flavor name", | ||
Computed: true, | ||
}, | ||
"name": { | ||
Type: schema.TypeString, | ||
Description: "Flavor name", | ||
Computed: true, | ||
}, | ||
"id": { | ||
Type: schema.TypeString, | ||
Description: "Instance id", | ||
Computed: true, | ||
}, | ||
"image_id": { | ||
Type: schema.TypeString, | ||
Description: "Image id", | ||
Computed: true, | ||
}, | ||
"ssh_key": { | ||
Type: schema.TypeString, | ||
Description: "Instance task state", | ||
Computed: true, | ||
}, | ||
"task_state": { | ||
Type: schema.TypeString, | ||
Description: "Instance task state", | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func dataSourceCloudProjectInstancesRead(d *schema.ResourceData, meta interface{}) error { | ||
config := meta.(*Config) | ||
serviceName := d.Get("service_name").(string) | ||
region := d.Get("region").(string) | ||
|
||
endpoint := fmt.Sprintf("/cloud/project/%s/region/%s/instance", | ||
url.PathEscape(serviceName), | ||
url.PathEscape(region), | ||
) | ||
var res []CloudProjectInstanceResponse | ||
|
||
log.Printf("[DEBUG] Will read instances from project %s in region %s", serviceName, region) | ||
if err := config.OVHClient.Get(endpoint, &res); err != nil { | ||
return helpers.CheckDeleted(d, err, endpoint) | ||
} | ||
|
||
instances := make([]map[string]interface{}, len(res)) | ||
ids := make([]string, len(res)) | ||
for i, instance := range res { | ||
instances[i] = instance.ToMap() | ||
ids = append(ids, instance.Id) | ||
} | ||
sort.Strings(ids) | ||
|
||
d.SetId(hashcode.Strings(ids)) | ||
d.Set("instances", instances) | ||
|
||
log.Printf("[DEBUG] Read instances: %+v", res) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. that could end up being a long log, maybe we should just log the ids ? |
||
return nil | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(unless you know it's sorted)