lacework · afiune · Nov 8, 2022 · Nov 8, 2022
diff --git a/lacework/cloud_account_importer.go b/lacework/cloud_account_importer.go
@@ -0,0 +1,27 @@
+package lacework
+
+import (
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/lacework/go-sdk/api"
+)
+
+func importLaceworkCloudAccount(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	lacework := meta.(*api.Client)
+	var response api.CloudAccountResponse
+
+	log.Printf("[INFO] Importing Lacework Cloud Account with guid: %s\n", d.Id())
+	err := lacework.V2.CloudAccounts.Get(d.Id(), &response)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.Data.IntgGuid == d.Id() {
+		log.Printf("[INFO] Cloud Account integration found using APIv2 with guid: %v\n", response.Data.IntgGuid)
+		return []*schema.ResourceData{d}, nil
+	}
+
+	log.Printf("[INFO] Raw APIv2 Cloud Account response: %v\n", response)
+	return []*schema.ResourceData{d}, nil
+}
diff --git a/lacework/container_registry_importer.go b/lacework/container_registry_importer.go
@@ -0,0 +1,29 @@
+package lacework
+
+import (
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/lacework/go-sdk/api"
+)
+
+func importLaceworkContainerRegistry(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	lacework := meta.(*api.Client)
+	var response api.ContainerRegistryResponse
+
+	log.Printf("[INFO] Importing Lacework Container Registry with guid: %s\n", d.Id())
+	err := lacework.V2.CloudAccounts.Get(d.Id(), &response)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.Data.IntgGuid == d.Id() {
+		log.Printf("[INFO] Container Registry found using APIv2 with guid: %v\n", response.Data.IntgGuid)
+		return []*schema.ResourceData{d}, nil
+	}
+
+	log.Printf("[INFO] Raw APIv2 Container Registry response: %v\n", response)
+
+	return []*schema.ResourceData{d}, nil
+}
diff --git a/lacework/integration_importer.go b/lacework/integration_importer.go
diff --git a/lacework/resource_lacework_agent_access_token.go b/lacework/resource_lacework_agent_access_token.go
@@ -184,21 +184,19 @@ func importLaceworkAgentAccessToken(d *schema.ResourceData, meta interface{}) ([
 	lacework := meta.(*api.Client)
 
 	log.Printf("[INFO] Importing agent access token.")
-	response, err := lacework.Agents.GetToken(d.Id())
+	response, err := lacework.V2.AgentAccessTokens.Get(d.Id())
 	if err != nil {
 		return nil, err
 	}
 
-	for _, token := range response.Data {
-		if token.AccessToken == d.Id() {
-			log.Printf("[INFO] agent access token found. name=%s, description=%s, enabled=%t",
-				token.TokenAlias, token.Props.Description, token.Status())
+	if response.Data.AccessToken == d.Id() {
+		log.Printf("[INFO] agent access token found. name=%s, description=%s, enabled=%t",
+			response.Data.TokenAlias, response.Data.Props.Description, response.Data.State())
 
-			d.Set("token", token.AccessToken)
-			d.SetId(token.TokenAlias)
+		d.Set("token", response.Data.AccessToken)
+		d.SetId(response.Data.TokenAlias)
 
-			return []*schema.ResourceData{d}, nil
-		}
+		return []*schema.ResourceData{d}, nil
 	}
 
 	log.Printf("[INFO] Raw response: %v\n", response)

diff --git a/lacework/resource_lacework_alert_channel_aws_cloudwatch.go b/lacework/resource_lacework_alert_channel_aws_cloudwatch.go
@@ -17,7 +17,7 @@ func resourceLaceworkAlertChannelAwsCloudWatch() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelAwsCloudWatchDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_aws_s3.go b/lacework/resource_lacework_alert_channel_aws_s3.go
@@ -16,7 +16,7 @@ func resourceLaceworkAlertChannelAwsS3() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelAwsS3Delete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {

diff --git a/lacework/resource_lacework_alert_channel_cisco_webex.go b/lacework/resource_lacework_alert_channel_cisco_webex.go
@@ -15,7 +15,7 @@ func resourceLaceworkAlertChannelCiscoWebex() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelCiscoWebexDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_datadog.go b/lacework/resource_lacework_alert_channel_datadog.go
@@ -16,7 +16,7 @@ func resourceLaceworkAlertChannelDatadog() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelDatadogDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_email.go b/lacework/resource_lacework_alert_channel_email.go
@@ -17,7 +17,7 @@ func resourceLaceworkAlertChannelEmail() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelEmailDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_slack.go b/lacework/resource_lacework_alert_channel_slack.go
@@ -16,7 +16,7 @@ func resourceLaceworkAlertChannelSlack() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelSlackDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_victorops.go b/lacework/resource_lacework_alert_channel_victorops.go
@@ -15,7 +15,7 @@ func resourceLaceworkAlertChannelVictorOps() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelVictorOpsDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_alert_channel_webhook.go b/lacework/resource_lacework_alert_channel_webhook.go
@@ -15,7 +15,7 @@ func resourceLaceworkAlertChannelWebhook() *schema.Resource {
 		Delete: resourceLaceworkAlertChannelWebhookDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkAlertChannel,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_aws_agentless_scanning.go b/lacework/resource_lacework_integration_aws_agentless_scanning.go
@@ -18,7 +18,7 @@ func resourceLaceworkIntegrationAwsAgentlessScanning() *schema.Resource {
 		Update:   resourceLaceworkIntegrationAwsAgentlessScanningUpdate,
 		Delete:   resourceLaceworkIntegrationAwsAgentlessScanningDelete,
 		Schema:   awsAgentlessScanningIntegrationSchema,
-		Importer: &schema.ResourceImporter{State: importLaceworkIntegration},
+		Importer: &schema.ResourceImporter{State: importLaceworkCloudAccount},
 	}
 }
 

diff --git a/lacework/resource_lacework_integration_aws_cfg.go b/lacework/resource_lacework_integration_aws_cfg.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAwsCfg() *schema.Resource {
 		Delete: resourceLaceworkIntegrationAwsCfgDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_aws_ct.go b/lacework/resource_lacework_integration_aws_ct.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAwsCloudTrail() *schema.Resource {
 		Update:   resourceLaceworkIntegrationAwsCloudTrailUpdate,
 		Delete:   resourceLaceworkIntegrationAwsCloudTrailDelete,
 		Schema:   awsCloudTrailIntegrationSchema,
-		Importer: &schema.ResourceImporter{State: importLaceworkIntegration},
+		Importer: &schema.ResourceImporter{State: importLaceworkCloudAccount},
 	}
 }
 

diff --git a/lacework/resource_lacework_integration_aws_eks_audit_log.go b/lacework/resource_lacework_integration_aws_eks_audit_log.go
@@ -18,7 +18,7 @@ func resourceLaceworkIntegrationAwsEksAuditLog() *schema.Resource {
 		Update:   resourceLaceworkIntegrationAwsEksAuditLogUpdate,
 		Delete:   resourceLaceworkIntegrationAwsEksAuditLogDelete,
 		Schema:   awsEksAuditLogIntegrationSchema,
-		Importer: &schema.ResourceImporter{State: importLaceworkIntegration},
+		Importer: &schema.ResourceImporter{State: importLaceworkCloudAccount},
 	}
 }
 

diff --git a/lacework/resource_lacework_integration_aws_govcloud_cfg.go b/lacework/resource_lacework_integration_aws_govcloud_cfg.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAwsGovCloudCfg() *schema.Resource {
 		Delete: resourceLaceworkIntegrationAwsGovCloudCfgDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_aws_govcloud_ct.go b/lacework/resource_lacework_integration_aws_govcloud_ct.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAwsGovCloudCT() *schema.Resource {
 		Delete: resourceLaceworkIntegrationAwsGovCloudCTDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_aws_org_agentless_scanning.go b/lacework/resource_lacework_integration_aws_org_agentless_scanning.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAwsOrgAgentlessScanning() *schema.Resource {
 		Update:   resourceLaceworkIntegrationAwsOrgAgentlessScanningUpdate,
 		Delete:   resourceLaceworkIntegrationAwsOrgAgentlessScanningDelete,
 		Schema:   awsOrgAgentlessScanningIntegrationSchema,
-		Importer: &schema.ResourceImporter{State: importLaceworkIntegration},
+		Importer: &schema.ResourceImporter{State: importLaceworkCloudAccount},
 	}
 }
 

diff --git a/lacework/resource_lacework_integration_azure_al.go b/lacework/resource_lacework_integration_azure_al.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAzureActivityLog() *schema.Resource {
 		Delete: resourceLaceworkIntegrationAzureActivityLogDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_azure_cfg.go b/lacework/resource_lacework_integration_azure_cfg.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationAzureCfg() *schema.Resource {
 		Delete: resourceLaceworkIntegrationAzureCfgDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_docker_hub.go b/lacework/resource_lacework_integration_docker_hub.go
@@ -17,7 +17,7 @@ func resourceLaceworkIntegrationDockerHub() *schema.Resource {
 		Delete: resourceLaceworkIntegrationDockerHubDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkContainerRegistry,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_docker_v2.go b/lacework/resource_lacework_integration_docker_v2.go
@@ -17,7 +17,7 @@ func resourceLaceworkIntegrationDockerV2() *schema.Resource {
 		Delete: resourceLaceworkIntegrationDockerV2Delete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkContainerRegistry,
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -240,7 +240,7 @@ func resourceLaceworkIntegrationDockerV2Delete(d *schema.ResourceData, meta inte
 
 	log.Printf("[INFO] Deleting %s registry type with guid: %v\n", api.DockerhubV2ContainerRegistry.String(), d.Id())
 
-	_, err := lacework.Integrations.Delete(d.Id())
+	err := lacework.V2.ContainerRegistries.Delete(d.Id())
 	if err != nil {
 		return err
 	}

diff --git a/lacework/resource_lacework_integration_ecr.go b/lacework/resource_lacework_integration_ecr.go
@@ -258,7 +258,7 @@ func resourceLaceworkIntegrationEcrUpdate(d *schema.ResourceData, meta interface
 			log.Println("[WARN] Change of authentication method detected. Need destroy and recreation")
 			log.Printf("[INFO] Deleting %s integration %s registry type with guid: %v\n",
 				api.ContainerRegistryIntegration.String(), api.EcrRegistry.String(), d.Id())
-			_, err := lacework.Integrations.Delete(d.Id())
+			err := lacework.V2.ContainerRegistries.Delete(d.Id())
 			if err != nil {
 				return err
 			}
@@ -284,7 +284,7 @@ func resourceLaceworkIntegrationEcrUpdate(d *schema.ResourceData, meta interface
 			log.Println("[WARN] Change of authentication method detected. Need destroy and recreation")
 			log.Printf("[INFO] Deleting %s integration %s registry type with guid: %v\n",
 				api.ContainerRegistryIntegration.String(), api.EcrRegistry.String(), d.Id())
-			_, err := lacework.Integrations.Delete(d.Id())
+			err := lacework.V2.ContainerRegistries.Delete(d.Id())
 			if err != nil {
 				return err
 			}

diff --git a/lacework/resource_lacework_integration_gar.go b/lacework/resource_lacework_integration_gar.go
@@ -48,7 +48,7 @@ func resourceLaceworkIntegrationGar() *schema.Resource {
 		Delete: resourceLaceworkIntegrationGarDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkContainerRegistry,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_gcp_at.go b/lacework/resource_lacework_integration_gcp_at.go
@@ -20,7 +20,7 @@ func resourceLaceworkIntegrationGcpAt() *schema.Resource {
 		Delete: resourceLaceworkIntegrationGcpAtDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_gcp_cfg.go b/lacework/resource_lacework_integration_gcp_cfg.go
@@ -20,7 +20,7 @@ func resourceLaceworkIntegrationGcpCfg() *schema.Resource {
 		Delete: resourceLaceworkIntegrationGcpCfgDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkCloudAccount,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_gcp_gke_audit_log.go b/lacework/resource_lacework_integration_gcp_gke_audit_log.go
@@ -19,7 +19,7 @@ func resourceLaceworkIntegrationGcpGkeAuditLog() *schema.Resource {
 		Update:   resourceLaceworkIntegrationGcpGkeAuditLogUpdate,
 		Delete:   resourceLaceworkIntegrationGcpGkeAuditLogDelete,
 		Schema:   gcpGkeAuditLogIntegrationSchema,
-		Importer: &schema.ResourceImporter{State: importLaceworkIntegration},
+		Importer: &schema.ResourceImporter{State: importLaceworkCloudAccount},
 	}
 }
 

diff --git a/lacework/resource_lacework_integration_gcr.go b/lacework/resource_lacework_integration_gcr.go
@@ -18,7 +18,7 @@ func resourceLaceworkIntegrationGcr() *schema.Resource {
 		Delete: resourceLaceworkIntegrationGcrDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkContainerRegistry,
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/lacework/resource_lacework_integration_ghcr.go b/lacework/resource_lacework_integration_ghcr.go
@@ -17,7 +17,7 @@ func resourceLaceworkIntegrationGhcr() *schema.Resource {
 		Delete: resourceLaceworkIntegrationGhcrDelete,
 
 		Importer: &schema.ResourceImporter{
-			State: importLaceworkIntegration,
+			State: importLaceworkContainerRegistry,
 		},
 
 		Schema: map[string]*schema.Schema{