STACKITRCO-187 - Add option iaas API param agent

docs/data-sources/server.md

@@ -34,6 +34,7 @@ data "stackit_server" "example" {
 ### Read-Only
 
 - `affinity_group` (String) The affinity group the server is assigned to.
+- `agent` (Attributes) STACKIT Server Agent as setup on the server (see [below for nested schema](#nestedatt--agent))
 - `availability_zone` (String) The availability zone of the server.
 - `boot_volume` (Attributes) The boot volume for the server (see [below for nested schema](#nestedatt--boot_volume))
 - `created_at` (String) Date-time when the server was created
@@ -48,6 +49,14 @@ data "stackit_server" "example" {
 - `updated_at` (String) Date-time when the server was updated
 - `user_data` (String) User data that is passed via cloud-init to the server.
 
+<a id="nestedatt--agent"></a>
+### Nested Schema for `agent`
+
+Read-Only:
+
+- `provisioned` (Boolean) Whether a STACKIT Server Agent is provisioned at the server
+
+
 <a id="nestedatt--boot_volume"></a>
 ### Nested Schema for `boot_volume`
 

docs/resources/server.md

@@ -6,46 +6,43 @@ description: |-
   Server resource schema. Must have a region specified in the provider configuration.
   Example Usage
   With key pair
-
-  resource "stackit_key_pair" "keypair" {
+  ```terraform
+  resource "stackitkeypair" "keypair" {
     name       = "example-key-pair"
-    public_key = chomp(file("path/to/id_rsa.pub"))
+    publickey = chomp(file("path/to/idrsa.pub"))
   }
-
-  resource "stackit_server" "user-data-from-file" {
-    project_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    boot_volume = {
+  resource "stackitserver" "user-data-from-file" {
+    projectid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
     name         = "example-server"
-    machine_type = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
-    user_data    = file("${path.module}/cloud-init.yaml")
+    machinetype = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
+    userdata    = file("${path.module}/cloud-init.yaml")
   }
-
-
+  ```
   Boot from volume
-
-  resource "stackit_server" "boot-from-volume" {
-    project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  ```terraform
+  resource "stackitserver" "boot-from-volume" {
+    projectid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name       = "example-server"
-    boot_volume = {
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
-    availability_zone = "eu01-1"
-    machine_type      = "g2i.1"
-    keypair_name      = "example-keypair"
+    availabilityzone = "eu01-1"
+    machinetype      = "g2i.1"
+    keypairname      = "example-keypair"
   }
-
-
+  ```
   Boot from existing volume
-
-  resource "stackit_volume" "example-volume" {
-    project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  ```terraform
+  resource "stackitvolume" "example-volume" {
+    projectid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     size       = 12
     source = {
       type = "image"
@@ -54,126 +51,115 @@ description: |-
     name              = "example-volume"
     availability_zone = "eu01-1"
   }
-
-  resource "stackit_server" "boot-from-volume" {
-    project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  resource "stackitserver" "boot-from-volume" {
+    projectid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name       = "example-server"
-    boot_volume = {
-      source_type = "volume"
-      source_id   = stackit_volume.example-volume.volume_id
+    bootvolume = {
+      sourcetype = "volume"
+      sourceid   = stackitvolume.example-volume.volumeid
     }
-    availability_zone = "eu01-1"
-    machine_type      = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
+    availabilityzone = "eu01-1"
+    machinetype      = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
   }
-
-
+  ```
   Network setup
-
-  resource "stackit_network" "network" {
-    project_id         = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  ```terraform
+  resource "stackitnetwork" "network" {
+    projectid         = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name               = "example-network"
     nameservers        = ["192.0.2.0", "198.51.100.0", "203.0.113.0"]
-    ipv4_prefix_length = 24
+    ipv4prefixlength = 24
   }
-
-  resource "stackit_security_group" "sec-group" {
+  resource "stackitsecuritygroup" "sec-group" {
     project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name       = "example-security-group"
     stateful   = true
   }
-
-  resource "stackit_security_group_rule" "rule" {
-    project_id        = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    security_group_id = stackit_security_group.sec-group.security_group_id
+  resource "stackitsecuritygrouprule" "rule" {
+    projectid        = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    securitygroupid = stackitsecuritygroup.sec-group.securitygroupid
     direction         = "ingress"
     ether_type         = "IPv4"
   }
-
-  resource "stackit_network_interface" "nic" {
-    project_id         = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    network_id         = stackit_network.network.network_id
-    security_group_ids = [stackit_security_group.sec-group.security_group_id]
+  resource "stackitnetworkinterface" "nic" {
+    projectid         = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    networkid         = stackitnetwork.network.networkid
+    securitygroupids = [stackitsecuritygroup.sec-group.securitygroupid]
   }
-
-  resource "stackit_server" "server-with-network" {
-    project_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  resource "stackitserver" "server-with-network" {
+    projectid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name         = "example-server"
-    boot_volume = {
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
-    machine_type = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
-    network_interfaces = [
-      stackit_network_interface.nic.network_interface_id
-    ]	
+    machinetype = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
+    networkinterfaces = [
+      stackitnetworkinterface.nic.networkinterfaceid
+    ]
   }
-
-  resource "stackit_public_ip" "public-ip" {
-    project_id           = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    network_interface_id = stackit_network_interface.nic.network_interface_id
+  resource "stackitpublicip" "public-ip" {
+    projectid           = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    networkinterfaceid = stackitnetworkinterface.nic.networkinterface_id
   }
-
-
+  ```
   Server with attached volume
-
-  resource "stackit_volume" "example-volume" {
-    project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  ```terraform
+  resource "stackitvolume" "example-volume" {
+    projectid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     size       = 12
-    performance_class = "storage_premium_perf6"
+    performanceclass = "storagepremiumperf6"
     name              = "example-volume"
-    availability_zone = "eu01-1"
+    availabilityzone = "eu01-1"
   }
-
-  resource "stackit_server" "server-with-volume" {
-    project_id        = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  resource "stackitserver" "server-with-volume" {
+    projectid        = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     name              = "example-server"
-    boot_volume = {
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
-    availability_zone = "eu01-1"
-    machine_type      = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
+    availabilityzone = "eu01-1"
+    machinetype      = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
   }
-
-  resource "stackit_server_volume_attach" "attach_volume" {
-    project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    server_id  = stackit_server.server-with-volume.server_id
-    volume_id  = stackit_volume.example-volume.volume_id
+  resource "stackitservervolumeattach" "attachvolume" {
+    projectid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    serverid  = stackitserver.server-with-volume.serverid
+    volumeid  = stackitvolume.example-volume.volume_id
   }
-
-
+  ```
   Server with user data (cloud-init)
-
-  resource "stackit_server" "user-data" {
-    project_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    boot_volume = {
+  ```terraform
+  resource "stackitserver" "user-data" {
+    projectid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
     name         = "example-server"
-    machine_type = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
-    user_data    = "#!/bin/bash\n/bin/su"
+    machinetype = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
+    userdata    = "#!/bin/bash\n/bin/su"
   }
-
-  resource "stackit_server" "user-data-from-file" {
-    project_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    boot_volume = {
+  resource "stackitserver" "user-data-from-file" {
+    projectid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    bootvolume = {
       size        = 64
-      source_type = "image"
-      source_id   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      sourcetype = "image"
+      sourceid   = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     }
     name         = "example-server"
-    machine_type = "g2i.1"
-    keypair_name = stackit_key_pair.keypair.name
-    user_data    = file("${path.module}/cloud-init.yaml")
+    machinetype = "g2i.1"
+    keypairname = stackitkeypair.keypair.name
+    userdata    = file("${path.module}/cloud-init.yaml")
   }
+  ```
 ---
 
 # stackit_server (Resource)
@@ -404,6 +390,7 @@ import {
 ### Optional
 
 - `affinity_group` (String) The affinity group the server is assigned to.
+- `agent` (Attributes) The STACKIT Server Agent configured for the server (see [below for nested schema](#nestedatt--agent))
 - `availability_zone` (String) The availability zone of the server.
 - `boot_volume` (Attributes) The boot volume for the server (see [below for nested schema](#nestedatt--boot_volume))
 - `desired_status` (String) The desired status of the server resource. Possible values are: `active`, `inactive`, `deallocated`.
@@ -422,6 +409,14 @@ import {
 - `server_id` (String) The server ID.
 - `updated_at` (String) Date-time when the server was updated
 
+<a id="nestedatt--agent"></a>
+### Nested Schema for `agent`
+
+Optional:
+
+- `provisioned` (Boolean) Whether a STACKIT Server Agent should be provisioned at the server
+
+
 <a id="nestedatt--boot_volume"></a>
 ### Nested Schema for `boot_volume`
 

stackit/internal/services/iaas/server/datasource.go

@@ -34,6 +34,7 @@ type DataSourceModel struct {
 	ServerId          types.String `tfsdk:"server_id"`
 	MachineType       types.String `tfsdk:"machine_type"`
 	Name              types.String `tfsdk:"name"`
+	Agent             types.Object `tfsdk:"agent"`
 	AvailabilityZone  types.String `tfsdk:"availability_zone"`
 	BootVolume        types.Object `tfsdk:"boot_volume"`
 	ImageId           types.String `tfsdk:"image_id"`
@@ -52,6 +53,10 @@ var bootVolumeDataTypes = map[string]attr.Type{
 	"delete_on_termination": basetypes.BoolType{},
 }
 
+var agentDataTypes = map[string]attr.Type{
+	"provisioned": basetypes.BoolType{},
+}
+
 // NewServerDataSource is a helper function to simplify the provider implementation.
 func NewServerDataSource() datasource.DataSource {
 	return &serverDataSource{}
@@ -123,6 +128,16 @@ func (d *serverDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 				MarkdownDescription: "Name of the type of the machine for the server. Possible values are documented in [Virtual machine flavors](https://docs.stackit.cloud/products/compute-engine/server/basics/machine-types/)",
 				Computed:            true,
 			},
+			"agent": schema.SingleNestedAttribute{
+				Description: "STACKIT Server Agent as setup on the server",
+				Computed:    true,
+				Attributes: map[string]schema.Attribute{
+					"provisioned": schema.BoolAttribute{
+						Description: "Whether a STACKIT Server Agent is provisioned at the server",
+						Computed:    true,
+					},
+				},
+			},
 			"availability_zone": schema.StringAttribute{
 				Description: "The availability zone of the server.",
 				Computed:    true,
@@ -304,6 +319,18 @@ func mapDataSourceFields(ctx context.Context, serverResp *iaas.Server, model *Da
 		model.BootVolume = types.ObjectNull(bootVolumeDataTypes)
 	}
 
+	if serverResp.Agent != nil {
+		agent, diags := types.ObjectValue(agentDataTypes, map[string]attr.Value{
+			"provisioned": types.BoolPointerValue(serverResp.Agent.Provisioned),
+		})
+		if diags.HasError() {
+			return fmt.Errorf("failed to map agent: %w", core.DiagsToError(diags))
+		}
+		model.Agent = agent
+	} else {
+		model.Agent = types.ObjectNull(agentDataTypes)
+	}
+
 	if serverResp.UserData != nil && len(*serverResp.UserData) > 0 {
 		model.UserData = types.StringValue(string(*serverResp.UserData))
 	}