Skip to content

Commit

Permalink
transfer
Browse files Browse the repository at this point in the history
  • Loading branch information
gdavison committed Feb 13, 2025
1 parent a4f9976 commit 66778c3
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 15 deletions.
1 change: 0 additions & 1 deletion .ci/semgrep/aws/input-on-heap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ rules:
- "internal/service/q*"
- "internal/service/r*"
- "internal/service/s*"
- "internal/service/transfer"
patterns:
- pattern-either:
- pattern: |
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/access.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,11 @@ func resourceAccessDelete(ctx context.Context, d *schema.ResourceData, meta inte
}

log.Printf("[DEBUG] Deleting Transfer Access: %s", d.Id())
_, err = conn.DeleteAccess(ctx, &transfer.DeleteAccessInput{
input := transfer.DeleteAccessInput{
ExternalId: aws.String(externalID),
ServerId: aws.String(serverID),
})
}
_, err = conn.DeleteAccess(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/agreement.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,11 @@ func resourceAgreementDelete(ctx context.Context, d *schema.ResourceData, meta i
}

log.Printf("[DEBUG] Deleting Transfer Agreement: %s", d.Id())
_, err = conn.DeleteAgreement(ctx, &transfer.DeleteAgreementInput{
input := transfer.DeleteAgreementInput{
AgreementId: aws.String(agreementID),
ServerId: aws.String(serverID),
})
}
_, err = conn.DeleteAgreement(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,10 @@ func resourceCertificateDelete(ctx context.Context, d *schema.ResourceData, meta
conn := meta.(*conns.AWSClient).TransferClient(ctx)

log.Printf("[DEBUG] Deleting Transfer Certificate: %s", d.Id())
_, err := conn.DeleteCertificate(ctx, &transfer.DeleteCertificateInput{
input := transfer.DeleteCertificateInput{
CertificateId: aws.String(d.Id()),
})
}
_, err := conn.DeleteCertificate(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,10 @@ func resourceConnectorDelete(ctx context.Context, d *schema.ResourceData, meta i
conn := meta.(*conns.AWSClient).TransferClient(ctx)

log.Printf("[DEBUG] Deleting Transfer Connector: %s", d.Id())
_, err := conn.DeleteConnector(ctx, &transfer.DeleteConnectorInput{
input := transfer.DeleteConnectorInput{
ConnectorId: aws.String(d.Id()),
})
}
_, err := conn.DeleteConnector(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ func resourceProfileDelete(ctx context.Context, d *schema.ResourceData, meta int
conn := meta.(*conns.AWSClient).TransferClient(ctx)

log.Printf("[DEBUG] Deleting Transfer Profile: %s", d.Id())
_, err := conn.DeleteProfile(ctx, &transfer.DeleteProfileInput{
input := transfer.DeleteProfileInput{
ProfileId: aws.String(d.Id()),
})
}
_, err := conn.DeleteProfile(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/ssh_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,12 @@ func resourceSSHKeyDelete(ctx context.Context, d *schema.ResourceData, meta inte
}

log.Printf("[DEBUG] Deleting Transfer SSH Key: %s", d.Id())
_, err = conn.DeleteSshPublicKey(ctx, &transfer.DeleteSshPublicKeyInput{
input := transfer.DeleteSshPublicKeyInput{
UserName: aws.String(userName),
ServerId: aws.String(serverID),
SshPublicKeyId: aws.String(sshKeyID),
})
}
_, err = conn.DeleteSshPublicKey(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down
5 changes: 3 additions & 2 deletions internal/service/transfer/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -757,9 +757,10 @@ func resourceWorkflowDelete(ctx context.Context, d *schema.ResourceData, meta in
conn := meta.(*conns.AWSClient).TransferClient(ctx)

log.Printf("[DEBUG] Deleting Transfer Workflow: %s", d.Id())
_, err := conn.DeleteWorkflow(ctx, &transfer.DeleteWorkflowInput{
input := transfer.DeleteWorkflowInput{
WorkflowId: aws.String(d.Id()),
})
}
_, err := conn.DeleteWorkflow(ctx, &input)

if errs.IsA[*awstypes.ResourceNotFoundException](err) {
return diags
Expand Down

0 comments on commit 66778c3

Please sign in to comment.