Skip to content

Commit a52fde4

Browse files
refactor: add excludeCloudAssets to azure connector (#57)
1 parent beb48d2 commit a52fde4

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

internal/trendmicro/cloud_account_management/azure/api/cam_connector.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (c *CamClient) CreateSubscription(data *CreateSubscriptionRequest) error {
8686
fmt.Printf("Preparing to create subscription with data: %s\n", string(jsonData))
8787

8888
// Attempt to read the subscription to determine if it already exists
89-
describeResp, err := c.ReadSubscription(data.SubscriptionID)
89+
describeResp, err := c.ReadSubscription(data.SubscriptionID, true)
9090
if err != nil {
9191
if !strings.Contains(err.Error(), `"code": "NotFound"`) {
9292
return fmt.Errorf("failed to verify subscription existence: %w", err)
@@ -154,9 +154,12 @@ func (c *CamClient) CreateSubscription(data *CreateSubscriptionRequest) error {
154154
return nil
155155
}
156156

157-
func (c *CamClient) ReadSubscription(subscriptionID string) (*SubscriptionResponse, error) {
157+
func (c *CamClient) ReadSubscription(subscriptionID string, excludeCloudAssets bool) (*SubscriptionResponse, error) {
158158
cam.JitterSleep(cam.AzureJitterConfig)
159159
url := fmt.Sprintf("%s/beta/cam/azureSubscriptions/%s", c.Client.HostURL, subscriptionID)
160+
if excludeCloudAssets {
161+
url += "?excludeCloudAssets=true"
162+
}
160163

161164
req, err := http.NewRequest("GET", url, http.NoBody)
162165
if err != nil {

internal/trendmicro/cloud_account_management/azure/resources/cam_connector.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ func (r *CAMConnectorResource) Create(ctx context.Context, req resource.CreateRe
364364
)
365365
return
366366
}
367-
res, err := r.client.ReadSubscription(plan.SubscriptionID.ValueString())
367+
res, err := r.client.ReadSubscription(plan.SubscriptionID.ValueString(), true)
368368
if err != nil {
369369
resp.Diagnostics.AddError(
370370
"[CAM Connector][Create] Error Describing Subscription",
@@ -452,7 +452,7 @@ func (r *CAMConnectorResource) Read(ctx context.Context, req resource.ReadReques
452452
}
453453
}
454454

455-
res, err := r.client.ReadSubscription(state.SubscriptionID.ValueString())
455+
res, err := r.client.ReadSubscription(state.SubscriptionID.ValueString(), true)
456456
if err != nil {
457457
tflog.Warn(ctx, "[CAM Connector][Read] Failed to describe subscription, will attempt to create it", map[string]any{
458458
"error": err.Error(),
@@ -549,7 +549,7 @@ func (r *CAMConnectorResource) Read(ctx context.Context, req resource.ReadReques
549549
}
550550
}
551551

552-
res, err = r.client.ReadSubscription(state.SubscriptionID.ValueString())
552+
res, err = r.client.ReadSubscription(state.SubscriptionID.ValueString(), true)
553553
if err != nil {
554554
resp.Diagnostics.AddError(
555555
"[CAM Connector][Read] Error Describing Subscription",
@@ -714,7 +714,7 @@ func (r *CAMConnectorResource) Update(ctx context.Context, req resource.UpdateRe
714714
return
715715
}
716716

717-
res, err := r.client.ReadSubscription(plan.SubscriptionID.ValueString())
717+
res, err := r.client.ReadSubscription(plan.SubscriptionID.ValueString(), true)
718718
if err != nil {
719719
resp.Diagnostics.AddError(
720720
"[CAM Connector][Update] Error Describing Subscription",

0 commit comments

Comments
 (0)