Skip to content

Commit 89c0db7

Browse files
rcohenmaalexng-canuck
rcohenma
authored and
alexng-canuck
committed
name changes in the code to avoid collisions between resources with the same name in different services
1 parent 773e0d5 commit 89c0db7

13 files changed

+136
-136
lines changed

‎oci/monitoring_alarm_data_source.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
1010
)
1111

12-
func AlarmDataSource() *schema.Resource {
12+
func MonitoringAlarmDataSource() *schema.Resource {
1313
return &schema.Resource{
14-
Read: readSingularAlarm,
14+
Read: readSingularMonitoringAlarm,
1515
Schema: map[string]*schema.Schema{
1616
"alarm_id": {
1717
Type: schema.TypeString,
@@ -127,25 +127,25 @@ func AlarmDataSource() *schema.Resource {
127127
}
128128
}
129129

130-
func readSingularAlarm(d *schema.ResourceData, m interface{}) error {
131-
sync := &AlarmDataSourceCrud{}
130+
func readSingularMonitoringAlarm(d *schema.ResourceData, m interface{}) error {
131+
sync := &MonitoringAlarmDataSourceCrud{}
132132
sync.D = d
133133
sync.Client = m.(*OracleClients).monitoringClient
134134

135135
return ReadResource(sync)
136136
}
137137

138-
type AlarmDataSourceCrud struct {
138+
type MonitoringAlarmDataSourceCrud struct {
139139
D *schema.ResourceData
140140
Client *oci_monitoring.MonitoringClient
141141
Res *oci_monitoring.GetAlarmResponse
142142
}
143143

144-
func (s *AlarmDataSourceCrud) VoidState() {
144+
func (s *MonitoringAlarmDataSourceCrud) VoidState() {
145145
s.D.SetId("")
146146
}
147147

148-
func (s *AlarmDataSourceCrud) Get() error {
148+
func (s *MonitoringAlarmDataSourceCrud) Get() error {
149149
request := oci_monitoring.GetAlarmRequest{}
150150

151151
if alarmId, ok := s.D.GetOkExists("alarm_id"); ok {
@@ -164,7 +164,7 @@ func (s *AlarmDataSourceCrud) Get() error {
164164
return nil
165165
}
166166

167-
func (s *AlarmDataSourceCrud) SetData() error {
167+
func (s *MonitoringAlarmDataSourceCrud) SetData() error {
168168
if s.Res == nil {
169169
return nil
170170
}

‎oci/monitoring_alarm_history_collection_data_source.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
1212
)
1313

14-
func AlarmHistoryCollectionDataSource() *schema.Resource {
14+
func MonitoringAlarmHistoryCollectionDataSource() *schema.Resource {
1515
return &schema.Resource{
16-
Read: readSingularAlarmHistoryCollection,
16+
Read: readSingularMonitoringAlarmHistoryCollection,
1717
Schema: map[string]*schema.Schema{
1818
"alarm_historytype": {
1919
Type: schema.TypeString,
@@ -65,25 +65,25 @@ func AlarmHistoryCollectionDataSource() *schema.Resource {
6565
}
6666
}
6767

68-
func readSingularAlarmHistoryCollection(d *schema.ResourceData, m interface{}) error {
69-
sync := &AlarmHistoryCollectionDataSourceCrud{}
68+
func readSingularMonitoringAlarmHistoryCollection(d *schema.ResourceData, m interface{}) error {
69+
sync := &MonitoringAlarmHistoryCollectionDataSourceCrud{}
7070
sync.D = d
7171
sync.Client = m.(*OracleClients).monitoringClient
7272

7373
return ReadResource(sync)
7474
}
7575

76-
type AlarmHistoryCollectionDataSourceCrud struct {
76+
type MonitoringAlarmHistoryCollectionDataSourceCrud struct {
7777
D *schema.ResourceData
7878
Client *oci_monitoring.MonitoringClient
7979
Res *oci_monitoring.GetAlarmHistoryResponse
8080
}
8181

82-
func (s *AlarmHistoryCollectionDataSourceCrud) VoidState() {
82+
func (s *MonitoringAlarmHistoryCollectionDataSourceCrud) VoidState() {
8383
s.D.SetId("")
8484
}
8585

86-
func (s *AlarmHistoryCollectionDataSourceCrud) Get() error {
86+
func (s *MonitoringAlarmHistoryCollectionDataSourceCrud) Get() error {
8787
request := oci_monitoring.GetAlarmHistoryRequest{}
8888

8989
if alarmHistorytype, ok := s.D.GetOkExists("alarm_historytype"); ok {
@@ -122,7 +122,7 @@ func (s *AlarmHistoryCollectionDataSourceCrud) Get() error {
122122
return nil
123123
}
124124

125-
func (s *AlarmHistoryCollectionDataSourceCrud) SetData() error {
125+
func (s *MonitoringAlarmHistoryCollectionDataSourceCrud) SetData() error {
126126
if s.Res == nil {
127127
return nil
128128
}

‎oci/monitoring_alarm_resource.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ import (
1313
oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
1414
)
1515

16-
func AlarmResource() *schema.Resource {
16+
func MonitoringAlarmResource() *schema.Resource {
1717
return &schema.Resource{
1818
Importer: &schema.ResourceImporter{
1919
State: schema.ImportStatePassthrough,
2020
},
2121
Timeouts: DefaultTimeout,
22-
Create: createAlarm,
23-
Read: readAlarm,
24-
Update: updateAlarm,
25-
Delete: deleteAlarm,
22+
Create: createMonitoringAlarm,
23+
Read: readMonitoringAlarm,
24+
Update: updateMonitoringAlarm,
25+
Delete: deleteMonitoringAlarm,
2626
Schema: map[string]*schema.Schema{
2727
// Required
2828
"compartment_id": {
@@ -149,73 +149,73 @@ func AlarmResource() *schema.Resource {
149149
}
150150
}
151151

152-
func createAlarm(d *schema.ResourceData, m interface{}) error {
153-
sync := &AlarmResourceCrud{}
152+
func createMonitoringAlarm(d *schema.ResourceData, m interface{}) error {
153+
sync := &MonitoringAlarmResourceCrud{}
154154
sync.D = d
155155
sync.Client = m.(*OracleClients).monitoringClient
156156

157157
return CreateResource(d, sync)
158158
}
159159

160-
func readAlarm(d *schema.ResourceData, m interface{}) error {
161-
sync := &AlarmResourceCrud{}
160+
func readMonitoringAlarm(d *schema.ResourceData, m interface{}) error {
161+
sync := &MonitoringAlarmResourceCrud{}
162162
sync.D = d
163163
sync.Client = m.(*OracleClients).monitoringClient
164164

165165
return ReadResource(sync)
166166
}
167167

168-
func updateAlarm(d *schema.ResourceData, m interface{}) error {
169-
sync := &AlarmResourceCrud{}
168+
func updateMonitoringAlarm(d *schema.ResourceData, m interface{}) error {
169+
sync := &MonitoringAlarmResourceCrud{}
170170
sync.D = d
171171
sync.Client = m.(*OracleClients).monitoringClient
172172

173173
return UpdateResource(d, sync)
174174
}
175175

176-
func deleteAlarm(d *schema.ResourceData, m interface{}) error {
177-
sync := &AlarmResourceCrud{}
176+
func deleteMonitoringAlarm(d *schema.ResourceData, m interface{}) error {
177+
sync := &MonitoringAlarmResourceCrud{}
178178
sync.D = d
179179
sync.Client = m.(*OracleClients).monitoringClient
180180
sync.DisableNotFoundRetries = true
181181

182182
return DeleteResource(d, sync)
183183
}
184184

185-
type AlarmResourceCrud struct {
185+
type MonitoringAlarmResourceCrud struct {
186186
BaseCrud
187187
Client *oci_monitoring.MonitoringClient
188188
Res *oci_monitoring.Alarm
189189
DisableNotFoundRetries bool
190190
}
191191

192-
func (s *AlarmResourceCrud) ID() string {
192+
func (s *MonitoringAlarmResourceCrud) ID() string {
193193
return *s.Res.Id
194194
}
195195

196-
func (s *AlarmResourceCrud) CreatedPending() []string {
196+
func (s *MonitoringAlarmResourceCrud) CreatedPending() []string {
197197
return []string{}
198198
}
199199

200-
func (s *AlarmResourceCrud) CreatedTarget() []string {
200+
func (s *MonitoringAlarmResourceCrud) CreatedTarget() []string {
201201
return []string{
202202
string(oci_monitoring.AlarmLifecycleStateActive),
203203
}
204204
}
205205

206-
func (s *AlarmResourceCrud) DeletedPending() []string {
206+
func (s *MonitoringAlarmResourceCrud) DeletedPending() []string {
207207
return []string{
208208
string(oci_monitoring.AlarmLifecycleStateDeleting),
209209
}
210210
}
211211

212-
func (s *AlarmResourceCrud) DeletedTarget() []string {
212+
func (s *MonitoringAlarmResourceCrud) DeletedTarget() []string {
213213
return []string{
214214
string(oci_monitoring.AlarmLifecycleStateDeleted),
215215
}
216216
}
217217

218-
func (s *AlarmResourceCrud) Create() error {
218+
func (s *MonitoringAlarmResourceCrud) Create() error {
219219
request := oci_monitoring.CreateAlarmRequest{}
220220

221221
if body, ok := s.D.GetOkExists("body"); ok {
@@ -323,7 +323,7 @@ func (s *AlarmResourceCrud) Create() error {
323323
return nil
324324
}
325325

326-
func (s *AlarmResourceCrud) Get() error {
326+
func (s *MonitoringAlarmResourceCrud) Get() error {
327327
request := oci_monitoring.GetAlarmRequest{}
328328

329329
tmp := s.D.Id()
@@ -340,7 +340,7 @@ func (s *AlarmResourceCrud) Get() error {
340340
return nil
341341
}
342342

343-
func (s *AlarmResourceCrud) Update() error {
343+
func (s *MonitoringAlarmResourceCrud) Update() error {
344344
request := oci_monitoring.UpdateAlarmRequest{}
345345

346346
tmp := s.D.Id()
@@ -451,7 +451,7 @@ func (s *AlarmResourceCrud) Update() error {
451451
return nil
452452
}
453453

454-
func (s *AlarmResourceCrud) Delete() error {
454+
func (s *MonitoringAlarmResourceCrud) Delete() error {
455455
request := oci_monitoring.DeleteAlarmRequest{}
456456

457457
tmp := s.D.Id()
@@ -463,7 +463,7 @@ func (s *AlarmResourceCrud) Delete() error {
463463
return err
464464
}
465465

466-
func (s *AlarmResourceCrud) SetData() error {
466+
func (s *MonitoringAlarmResourceCrud) SetData() error {
467467
if s.Res.Body != nil {
468468
s.D.Set("body", *s.Res.Body)
469469
}
@@ -537,7 +537,7 @@ func (s *AlarmResourceCrud) SetData() error {
537537
return nil
538538
}
539539

540-
func (s *AlarmResourceCrud) mapToSuppression(fieldKeyFormat string) (oci_monitoring.Suppression, error) {
540+
func (s *MonitoringAlarmResourceCrud) mapToSuppression(fieldKeyFormat string) (oci_monitoring.Suppression, error) {
541541
result := oci_monitoring.Suppression{}
542542

543543
if description, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "description")); ok {

‎oci/monitoring_alarm_statuses_data_source.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
1010
)
1111

12-
func AlarmStatusesDataSource() *schema.Resource {
12+
func MonitoringAlarmStatusesDataSource() *schema.Resource {
1313
return &schema.Resource{
14-
Read: readAlarmStatuses,
14+
Read: readMonitoringAlarmStatuses,
1515
Schema: map[string]*schema.Schema{
1616
"filter": dataSourceFiltersSchema(),
1717
"compartment_id": {
@@ -90,25 +90,25 @@ func AlarmStatusesDataSource() *schema.Resource {
9090
}
9191
}
9292

93-
func readAlarmStatuses(d *schema.ResourceData, m interface{}) error {
94-
sync := &AlarmStatusesDataSourceCrud{}
93+
func readMonitoringAlarmStatuses(d *schema.ResourceData, m interface{}) error {
94+
sync := &MonitoringAlarmStatusesDataSourceCrud{}
9595
sync.D = d
9696
sync.Client = m.(*OracleClients).monitoringClient
9797

9898
return ReadResource(sync)
9999
}
100100

101-
type AlarmStatusesDataSourceCrud struct {
101+
type MonitoringAlarmStatusesDataSourceCrud struct {
102102
D *schema.ResourceData
103103
Client *oci_monitoring.MonitoringClient
104104
Res *oci_monitoring.ListAlarmsStatusResponse
105105
}
106106

107-
func (s *AlarmStatusesDataSourceCrud) VoidState() {
107+
func (s *MonitoringAlarmStatusesDataSourceCrud) VoidState() {
108108
s.D.SetId("")
109109
}
110110

111-
func (s *AlarmStatusesDataSourceCrud) Get() error {
111+
func (s *MonitoringAlarmStatusesDataSourceCrud) Get() error {
112112
request := oci_monitoring.ListAlarmsStatusRequest{}
113113

114114
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -149,7 +149,7 @@ func (s *AlarmStatusesDataSourceCrud) Get() error {
149149
return nil
150150
}
151151

152-
func (s *AlarmStatusesDataSourceCrud) SetData() error {
152+
func (s *MonitoringAlarmStatusesDataSourceCrud) SetData() error {
153153
if s.Res == nil {
154154
return nil
155155
}
@@ -186,7 +186,7 @@ func (s *AlarmStatusesDataSourceCrud) SetData() error {
186186
}
187187

188188
if f, fOk := s.D.GetOkExists("filter"); fOk {
189-
resources = ApplyFilters(f.(*schema.Set), resources, AlarmStatusesDataSource().Schema["alarm_statuses"].Elem.(*schema.Resource).Schema)
189+
resources = ApplyFilters(f.(*schema.Set), resources, MonitoringAlarmStatusesDataSource().Schema["alarm_statuses"].Elem.(*schema.Resource).Schema)
190190
}
191191

192192
if err := s.D.Set("alarm_statuses", resources); err != nil {

‎oci/monitoring_alarms_data_source.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
1010
)
1111

12-
func AlarmsDataSource() *schema.Resource {
12+
func MonitoringAlarmsDataSource() *schema.Resource {
1313
return &schema.Resource{
14-
Read: readAlarms,
14+
Read: readMonitoringAlarms,
1515
Schema: map[string]*schema.Schema{
1616
"filter": dataSourceFiltersSchema(),
1717
"compartment_id": {
@@ -33,31 +33,31 @@ func AlarmsDataSource() *schema.Resource {
3333
"alarms": {
3434
Type: schema.TypeList,
3535
Computed: true,
36-
Elem: GetDataSourceItemSchema(AlarmResource()),
36+
Elem: GetDataSourceItemSchema(MonitoringAlarmResource()),
3737
},
3838
},
3939
}
4040
}
4141

42-
func readAlarms(d *schema.ResourceData, m interface{}) error {
43-
sync := &AlarmsDataSourceCrud{}
42+
func readMonitoringAlarms(d *schema.ResourceData, m interface{}) error {
43+
sync := &MonitoringAlarmsDataSourceCrud{}
4444
sync.D = d
4545
sync.Client = m.(*OracleClients).monitoringClient
4646

4747
return ReadResource(sync)
4848
}
4949

50-
type AlarmsDataSourceCrud struct {
50+
type MonitoringAlarmsDataSourceCrud struct {
5151
D *schema.ResourceData
5252
Client *oci_monitoring.MonitoringClient
5353
Res *oci_monitoring.ListAlarmsResponse
5454
}
5555

56-
func (s *AlarmsDataSourceCrud) VoidState() {
56+
func (s *MonitoringAlarmsDataSourceCrud) VoidState() {
5757
s.D.SetId("")
5858
}
5959

60-
func (s *AlarmsDataSourceCrud) Get() error {
60+
func (s *MonitoringAlarmsDataSourceCrud) Get() error {
6161
request := oci_monitoring.ListAlarmsRequest{}
6262

6363
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -102,7 +102,7 @@ func (s *AlarmsDataSourceCrud) Get() error {
102102
return nil
103103
}
104104

105-
func (s *AlarmsDataSourceCrud) SetData() error {
105+
func (s *MonitoringAlarmsDataSourceCrud) SetData() error {
106106
if s.Res == nil {
107107
return nil
108108
}
@@ -161,7 +161,7 @@ func (s *AlarmsDataSourceCrud) SetData() error {
161161
}
162162

163163
if f, fOk := s.D.GetOkExists("filter"); fOk {
164-
resources = ApplyFilters(f.(*schema.Set), resources, AlarmsDataSource().Schema["alarms"].Elem.(*schema.Resource).Schema)
164+
resources = ApplyFilters(f.(*schema.Set), resources, MonitoringAlarmsDataSource().Schema["alarms"].Elem.(*schema.Resource).Schema)
165165
}
166166

167167
if err := s.D.Set("alarms", resources); err != nil {

0 commit comments

Comments
 (0)