@@ -61,7 +61,7 @@ func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m in
61
61
return diag .FromErr (err )
62
62
}
63
63
64
- region , domainID , err := regional .ParseID (d .Get ("domain_id" ).(string ))
64
+ _ , domainID , err := regional .ParseID (d .Get ("domain_id" ).(string ))
65
65
if err != nil {
66
66
return diag .FromErr (err )
67
67
}
@@ -70,7 +70,7 @@ func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m in
70
70
reason := d .Get ("reason" ).(string )
71
71
typeBlockedList := d .Get ("type" ).(string )
72
72
73
- _ , err = api .BulkCreateBlocklists (& tem.BulkCreateBlocklistsRequest {
73
+ resp , err : = api .BulkCreateBlocklists (& tem.BulkCreateBlocklistsRequest {
74
74
Emails : emails ,
75
75
Region : region ,
76
76
DomainID : domainID ,
@@ -81,39 +81,43 @@ func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m in
81
81
return diag .FromErr (err )
82
82
}
83
83
84
- d .SetId (fmt .Sprintf ("%s- %s" , region , domainID ))
84
+ d .SetId (fmt .Sprintf ("%s/ %s" , region , resp . Blocklists [ 0 ]. ID ))
85
85
86
86
return ResourceBlockedListRead (ctx , d , m )
87
87
}
88
88
89
89
func ResourceBlockedListRead (ctx context.Context , d * schema.ResourceData , m interface {}) diag.Diagnostics {
90
- api , region , _ , err := NewAPIWithRegionAndID (m , d .Id ( ))
90
+ api , region , domainID , err := NewAPIWithRegionAndID (m , d .Get ( "domain_id" ).( string ))
91
91
if err != nil {
92
92
return diag .FromErr (err )
93
93
}
94
94
95
95
blocklists , err := api .ListBlocklists (& tem.ListBlocklistsRequest {
96
96
Region : region ,
97
97
Email : scw .StringPtr (d .Get ("email" ).(string )),
98
- DomainID : d . Get ( "domain_id" ).( string ) ,
98
+ DomainID : domainID ,
99
99
}, scw .WithContext (ctx ))
100
100
if err != nil {
101
101
if httperrors .Is404 (err ) {
102
102
d .SetId ("" )
103
+
103
104
return nil
104
105
}
106
+
105
107
return diag .FromErr (err )
106
108
}
107
109
108
110
if len (blocklists .Blocklists ) == 0 {
109
111
d .SetId ("" )
112
+
110
113
return nil
111
114
}
112
115
113
116
_ = d .Set ("email" , blocklists .Blocklists [0 ].Email )
114
117
_ = d .Set ("reason" , blocklists .Blocklists [0 ].Reason )
115
- _ = d .Set ("domain_id" , blocklists .Blocklists [0 ].DomainID )
118
+ _ = d .Set ("domain_id" , fmt . Sprintf ( "%s/%s" , region , blocklists .Blocklists [0 ].DomainID ) )
116
119
_ = d .Set ("type" , blocklists .Blocklists [0 ].Type )
120
+
117
121
return nil
118
122
}
119
123
@@ -130,6 +134,8 @@ func ResourceBlockedListDelete(ctx context.Context, d *schema.ResourceData, m in
130
134
if err != nil && ! httperrors .Is404 (err ) {
131
135
return diag .FromErr (err )
132
136
}
137
+
133
138
d .SetId ("" )
139
+
134
140
return nil
135
141
}
0 commit comments