@@ -7,23 +7,25 @@ import (
77
88 "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
99 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10+ "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
1011 "github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
1112 "github.com/mwielbut/pointy"
12- matlas "go.mongodb.org/atlas/mongodbatlas "
13+ "go.mongodb.org/atlas-sdk/v20231115005/admin "
1314)
1415
1516const (
1617 errorAuditingCreate = "error creating MongoDB Auditing (%s): %s"
1718 errorAuditingUpdate = "error updating MongoDB Auditing (%s): %s"
1819 errorAuditingRead = "error reading MongoDB Auditing (%s): %s"
20+ errorAuditingDelete = "error deleting MongoDB Auditing (%s): %s"
1921)
2022
2123func Resource () * schema.Resource {
2224 return & schema.Resource {
23- CreateContext : resourceMongoDBAtlasAuditingCreate ,
24- ReadContext : resourceMongoDBAtlasAuditingRead ,
25- UpdateContext : resourceMongoDBAtlasAuditingUpdate ,
26- DeleteContext : resourceMongoDBAtlasAuditingDelete ,
25+ CreateContext : resourceCreate ,
26+ ReadContext : resourceRead ,
27+ UpdateContext : resourceUpdate ,
28+ DeleteContext : resourceDelete ,
2729 Importer : & schema.ResourceImporter {
2830 StateContext : schema .ImportStatePassthroughContext ,
2931 },
@@ -56,38 +58,35 @@ func Resource() *schema.Resource {
5658 }
5759}
5860
59- func resourceMongoDBAtlasAuditingCreate (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
60- conn := meta .(* config.MongoDBClient ).Atlas
61-
61+ func resourceCreate (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
62+ connV2 := meta .(* config.MongoDBClient ).AtlasV2
6263 projectID := d .Get ("project_id" ).(string )
63- auditingReq := & matlas. Auditing {}
64+ auditingReq := & admin. AuditLog {}
6465
6566 if auditAuth , ok := d .GetOk ("audit_authorization_success" ); ok {
6667 auditingReq .AuditAuthorizationSuccess = pointy .Bool (auditAuth .(bool ))
6768 }
6869
6970 if auditFilter , ok := d .GetOk ("audit_filter" ); ok {
70- auditingReq .AuditFilter = auditFilter .(string )
71+ auditingReq .AuditFilter = conversion . StringPtr ( auditFilter .(string ) )
7172 }
7273
7374 if enabled , ok := d .GetOk ("enabled" ); ok {
7475 auditingReq .Enabled = pointy .Bool (enabled .(bool ))
7576 }
7677
77- _ , _ , err := conn . Auditing . Configure (ctx , projectID , auditingReq )
78+ _ , _ , err := connV2 . AuditingApi . UpdateAuditingConfiguration (ctx , projectID , auditingReq ). Execute ( )
7879 if err != nil {
7980 return diag .FromErr (fmt .Errorf (errorAuditingCreate , projectID , err ))
8081 }
8182
8283 d .SetId (projectID )
83-
84- return resourceMongoDBAtlasAuditingRead (ctx , d , meta )
84+ return resourceRead (ctx , d , meta )
8585}
8686
87- func resourceMongoDBAtlasAuditingRead (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
88- conn := meta .(* config.MongoDBClient ).Atlas
89-
90- auditing , resp , err := conn .Auditing .Get (context .Background (), d .Id ())
87+ func resourceRead (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
88+ connV2 := meta .(* config.MongoDBClient ).AtlasV2
89+ auditing , resp , err := connV2 .AuditingApi .GetAuditingConfiguration (ctx , d .Id ()).Execute ()
9190 if err != nil {
9291 if resp != nil && resp .StatusCode == http .StatusNotFound {
9392 d .SetId ("" )
@@ -97,65 +96,58 @@ func resourceMongoDBAtlasAuditingRead(ctx context.Context, d *schema.ResourceDat
9796 return diag .FromErr (fmt .Errorf (errorAuditingRead , d .Id (), err ))
9897 }
9998
100- if err := d .Set ("audit_authorization_success" , auditing .AuditAuthorizationSuccess ); err != nil {
99+ if err := d .Set ("audit_authorization_success" , auditing .GetAuditAuthorizationSuccess () ); err != nil {
101100 return diag .FromErr (fmt .Errorf (errorAuditingRead , d .Id (), err ))
102101 }
103102
104- if err := d .Set ("audit_filter" , auditing .AuditFilter ); err != nil {
103+ if err := d .Set ("audit_filter" , auditing .GetAuditFilter () ); err != nil {
105104 return diag .FromErr (fmt .Errorf (errorAuditingRead , d .Id (), err ))
106105 }
107106
108- if err := d .Set ("enabled" , auditing .Enabled ); err != nil {
107+ if err := d .Set ("enabled" , auditing .GetEnabled () ); err != nil {
109108 return diag .FromErr (fmt .Errorf (errorAuditingRead , d .Id (), err ))
110109 }
111110
112- if err := d .Set ("configuration_type" , auditing .ConfigurationType ); err != nil {
111+ if err := d .Set ("configuration_type" , auditing .GetConfigurationType () ); err != nil {
113112 return diag .FromErr (fmt .Errorf (errorAuditingRead , d .Id (), err ))
114113 }
115114
116115 return nil
117116}
118117
119- func resourceMongoDBAtlasAuditingUpdate (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
120- // Get the client connection.
121- conn := meta .(* config.MongoDBClient ).Atlas
122-
123- auditingReq := & matlas.Auditing {}
118+ func resourceUpdate (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
119+ connV2 := meta .(* config.MongoDBClient ).AtlasV2
120+ auditingReq := & admin.AuditLog {}
124121
125122 if d .HasChange ("audit_authorization_success" ) {
126123 auditingReq .AuditAuthorizationSuccess = pointy .Bool ((d .Get ("audit_authorization_success" ).(bool )))
127124 }
128125
129126 if d .HasChange ("audit_filter" ) {
130- auditingReq .AuditFilter = d .Get ("audit_filter" ).(string )
127+ auditingReq .AuditFilter = conversion . StringPtr ( d .Get ("audit_filter" ).(string ) )
131128 }
132129
133130 if d .HasChange ("enabled" ) {
134131 auditingReq .Enabled = pointy .Bool (d .Get ("enabled" ).(bool ))
135132 }
136133
137- _ , _ , err := conn . Auditing . Configure (ctx , d .Id (), auditingReq )
134+ _ , _ , err := connV2 . AuditingApi . UpdateAuditingConfiguration (ctx , d .Id (), auditingReq ). Execute ( )
138135 if err != nil {
139136 return diag .FromErr (fmt .Errorf (errorAuditingUpdate , d .Id (), err ))
140137 }
141138
142139 return nil
143140}
144141
145- func resourceMongoDBAtlasAuditingDelete (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
146- // Get the client connection.
147- conn := meta .(* config.MongoDBClient ).Atlas
148-
149- auditingReq := & matlas.Auditing {}
150-
151- auditingReq .Enabled = pointy .Bool (false )
152-
153- _ , _ , err := conn .Auditing .Configure (ctx , d .Id (), auditingReq )
142+ func resourceDelete (ctx context.Context , d * schema.ResourceData , meta any ) diag.Diagnostics {
143+ connV2 := meta .(* config.MongoDBClient ).AtlasV2
144+ auditingReq := & admin.AuditLog {
145+ Enabled : pointy .Bool (false ),
146+ }
147+ _ , _ , err := connV2 .AuditingApi .UpdateAuditingConfiguration (ctx , d .Id (), auditingReq ).Execute ()
154148 if err != nil {
155- return diag .FromErr (fmt .Errorf (errorAuditingUpdate , d .Id (), err ))
149+ return diag .FromErr (fmt .Errorf (errorAuditingDelete , d .Id (), err ))
156150 }
157-
158151 d .SetId ("" )
159-
160152 return nil
161153}
0 commit comments