Skip to content

Commit 47b1ffb

Browse files
sagarp337sagarp337
committed
Duplicate method name fix
1 parent cfb7814 commit 47b1ffb

File tree

82 files changed

+1748
-1753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1748
-1753
lines changed

‎internal/service/artifacts/artifacts_container_image_data_source.go‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -237,79 +237,3 @@ func (s *ArtifactsContainerImageDataSourceCrud) SetData() error {
237237

238238
return nil
239239
}
240-
241-
func ContainerImageLayerToMap(obj oci_artifacts.ContainerImageLayer) map[string]interface{} {
242-
result := map[string]interface{}{}
243-
244-
if obj.Digest != nil {
245-
result["digest"] = string(*obj.Digest)
246-
}
247-
248-
if obj.SizeInBytes != nil {
249-
result["size_in_bytes"] = strconv.FormatInt(*obj.SizeInBytes, 10)
250-
}
251-
252-
if obj.TimeCreated != nil {
253-
result["time_created"] = obj.TimeCreated.String()
254-
}
255-
256-
return result
257-
}
258-
259-
func ContainerImageSummaryToMap(obj oci_artifacts.ContainerImageSummary) map[string]interface{} {
260-
result := map[string]interface{}{}
261-
262-
if obj.CompartmentId != nil {
263-
result["compartment_id"] = string(*obj.CompartmentId)
264-
}
265-
266-
if obj.Digest != nil {
267-
result["digest"] = string(*obj.Digest)
268-
}
269-
270-
if obj.DisplayName != nil {
271-
result["display_name"] = string(*obj.DisplayName)
272-
}
273-
274-
if obj.Id != nil {
275-
result["id"] = string(*obj.Id)
276-
}
277-
278-
if obj.RepositoryId != nil {
279-
result["repository_id"] = string(*obj.RepositoryId)
280-
}
281-
282-
if obj.RepositoryName != nil {
283-
result["repository_name"] = string(*obj.RepositoryName)
284-
}
285-
286-
result["state"] = string(obj.LifecycleState)
287-
288-
if obj.TimeCreated != nil {
289-
result["time_created"] = obj.TimeCreated.String()
290-
}
291-
292-
if obj.Version != nil {
293-
result["version"] = string(*obj.Version)
294-
}
295-
296-
return result
297-
}
298-
299-
func ContainerVersionToMap(obj oci_artifacts.ContainerVersion) map[string]interface{} {
300-
result := map[string]interface{}{}
301-
302-
if obj.CreatedBy != nil {
303-
result["created_by"] = string(*obj.CreatedBy)
304-
}
305-
306-
if obj.TimeCreated != nil {
307-
result["time_created"] = obj.TimeCreated.String()
308-
}
309-
310-
if obj.Version != nil {
311-
result["version"] = string(*obj.Version)
312-
}
313-
314-
return result
315-
}

‎internal/service/artifacts/artifacts_container_images_data_source.go‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package artifacts
55

66
import (
77
"context"
8+
"strconv"
89

910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1011
oci_artifacts "github.com/oracle/oci-go-sdk/v65/artifacts"
@@ -310,3 +311,79 @@ func (s *ArtifactsContainerImagesDataSourceCrud) SetData() error {
310311

311312
return nil
312313
}
314+
315+
func ContainerImageLayerToMap(obj oci_artifacts.ContainerImageLayer) map[string]interface{} {
316+
result := map[string]interface{}{}
317+
318+
if obj.Digest != nil {
319+
result["digest"] = string(*obj.Digest)
320+
}
321+
322+
if obj.SizeInBytes != nil {
323+
result["size_in_bytes"] = strconv.FormatInt(*obj.SizeInBytes, 10)
324+
}
325+
326+
if obj.TimeCreated != nil {
327+
result["time_created"] = obj.TimeCreated.String()
328+
}
329+
330+
return result
331+
}
332+
333+
func ContainerImageSummaryToMap(obj oci_artifacts.ContainerImageSummary) map[string]interface{} {
334+
result := map[string]interface{}{}
335+
336+
if obj.CompartmentId != nil {
337+
result["compartment_id"] = string(*obj.CompartmentId)
338+
}
339+
340+
if obj.Digest != nil {
341+
result["digest"] = string(*obj.Digest)
342+
}
343+
344+
if obj.DisplayName != nil {
345+
result["display_name"] = string(*obj.DisplayName)
346+
}
347+
348+
if obj.Id != nil {
349+
result["id"] = string(*obj.Id)
350+
}
351+
352+
if obj.RepositoryId != nil {
353+
result["repository_id"] = string(*obj.RepositoryId)
354+
}
355+
356+
if obj.RepositoryName != nil {
357+
result["repository_name"] = string(*obj.RepositoryName)
358+
}
359+
360+
result["state"] = string(obj.LifecycleState)
361+
362+
if obj.TimeCreated != nil {
363+
result["time_created"] = obj.TimeCreated.String()
364+
}
365+
366+
if obj.Version != nil {
367+
result["version"] = string(*obj.Version)
368+
}
369+
370+
return result
371+
}
372+
373+
func ContainerVersionToMap(obj oci_artifacts.ContainerVersion) map[string]interface{} {
374+
result := map[string]interface{}{}
375+
376+
if obj.CreatedBy != nil {
377+
result["created_by"] = string(*obj.CreatedBy)
378+
}
379+
380+
if obj.TimeCreated != nil {
381+
result["time_created"] = obj.TimeCreated.String()
382+
}
383+
384+
if obj.Version != nil {
385+
result["version"] = string(*obj.Version)
386+
}
387+
388+
return result
389+
}

‎internal/service/certificates_management/certificates_management_association_data_source.go‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -124,37 +124,3 @@ func (s *CertificatesManagementAssociationDataSourceCrud) SetData() error {
124124

125125
return nil
126126
}
127-
128-
func AssociationSummaryToMap(obj oci_certificates_management.AssociationSummary) map[string]interface{} {
129-
result := map[string]interface{}{}
130-
131-
if obj.AssociatedResourceId != nil {
132-
result["associated_resource_id"] = string(*obj.AssociatedResourceId)
133-
}
134-
135-
result["association_type"] = string(obj.AssociationType)
136-
137-
if obj.CertificatesResourceId != nil {
138-
result["certificates_resource_id"] = string(*obj.CertificatesResourceId)
139-
}
140-
141-
if obj.CompartmentId != nil {
142-
result["compartment_id"] = string(*obj.CompartmentId)
143-
}
144-
145-
if obj.Id != nil {
146-
result["id"] = string(*obj.Id)
147-
}
148-
149-
if obj.Name != nil {
150-
result["name"] = string(*obj.Name)
151-
}
152-
153-
result["state"] = string(obj.LifecycleState)
154-
155-
if obj.TimeCreated != nil {
156-
result["time_created"] = obj.TimeCreated.String()
157-
}
158-
159-
return result
160-
}

‎internal/service/certificates_management/certificates_management_associations_data_source.go‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,37 @@ func (s *CertificatesManagementAssociationsDataSourceCrud) SetData() error {
207207

208208
return nil
209209
}
210+
211+
func AssociationSummaryToMap(obj oci_certificates_management.AssociationSummary) map[string]interface{} {
212+
result := map[string]interface{}{}
213+
214+
if obj.AssociatedResourceId != nil {
215+
result["associated_resource_id"] = string(*obj.AssociatedResourceId)
216+
}
217+
218+
result["association_type"] = string(obj.AssociationType)
219+
220+
if obj.CertificatesResourceId != nil {
221+
result["certificates_resource_id"] = string(*obj.CertificatesResourceId)
222+
}
223+
224+
if obj.CompartmentId != nil {
225+
result["compartment_id"] = string(*obj.CompartmentId)
226+
}
227+
228+
if obj.Id != nil {
229+
result["id"] = string(*obj.Id)
230+
}
231+
232+
if obj.Name != nil {
233+
result["name"] = string(*obj.Name)
234+
}
235+
236+
result["state"] = string(obj.LifecycleState)
237+
238+
if obj.TimeCreated != nil {
239+
result["time_created"] = obj.TimeCreated.String()
240+
}
241+
242+
return result
243+
}

‎internal/service/core/core_cpe_device_shape_data_source.go‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -138,35 +138,3 @@ func (s *CoreCpeDeviceShapeDataSourceCrud) SetData() error {
138138

139139
return nil
140140
}
141-
142-
func CpeDeviceConfigQuestionToMap(obj oci_core.CpeDeviceConfigQuestion) map[string]interface{} {
143-
result := map[string]interface{}{}
144-
145-
if obj.DisplayName != nil {
146-
result["display_name"] = string(*obj.DisplayName)
147-
}
148-
149-
if obj.Explanation != nil {
150-
result["explanation"] = string(*obj.Explanation)
151-
}
152-
153-
if obj.Key != nil {
154-
result["key"] = string(*obj.Key)
155-
}
156-
157-
return result
158-
}
159-
160-
func CpeDeviceInfoToMap(obj *oci_core.CpeDeviceInfo) map[string]interface{} {
161-
result := map[string]interface{}{}
162-
163-
if obj.PlatformSoftwareVersion != nil {
164-
result["platform_software_version"] = string(*obj.PlatformSoftwareVersion)
165-
}
166-
167-
if obj.Vendor != nil {
168-
result["vendor"] = string(*obj.Vendor)
169-
}
170-
171-
return result
172-
}

‎internal/service/core/core_cpe_device_shapes_data_source.go‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,35 @@ func (s *CoreCpeDeviceShapesDataSourceCrud) SetData() error {
142142

143143
return nil
144144
}
145+
146+
func CpeDeviceConfigQuestionToMap(obj oci_core.CpeDeviceConfigQuestion) map[string]interface{} {
147+
result := map[string]interface{}{}
148+
149+
if obj.DisplayName != nil {
150+
result["display_name"] = string(*obj.DisplayName)
151+
}
152+
153+
if obj.Explanation != nil {
154+
result["explanation"] = string(*obj.Explanation)
155+
}
156+
157+
if obj.Key != nil {
158+
result["key"] = string(*obj.Key)
159+
}
160+
161+
return result
162+
}
163+
164+
func CpeDeviceInfoToMap(obj *oci_core.CpeDeviceInfo) map[string]interface{} {
165+
result := map[string]interface{}{}
166+
167+
if obj.PlatformSoftwareVersion != nil {
168+
result["platform_software_version"] = string(*obj.PlatformSoftwareVersion)
169+
}
170+
171+
if obj.Vendor != nil {
172+
result["vendor"] = string(*obj.Vendor)
173+
}
174+
175+
return result
176+
}

‎internal/service/core/core_image_shape_data_source.go‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -143,31 +143,3 @@ func (s *CoreImageShapeDataSourceCrud) SetData() error {
143143

144144
return nil
145145
}
146-
147-
func ImageMemoryConstraintsToMap(obj *oci_core.ImageMemoryConstraints) map[string]interface{} {
148-
result := map[string]interface{}{}
149-
150-
if obj.MaxInGBs != nil {
151-
result["max_in_gbs"] = int(*obj.MaxInGBs)
152-
}
153-
154-
if obj.MinInGBs != nil {
155-
result["min_in_gbs"] = int(*obj.MinInGBs)
156-
}
157-
158-
return result
159-
}
160-
161-
func ImageOcpuConstraintsToMap(obj *oci_core.ImageOcpuConstraints) map[string]interface{} {
162-
result := map[string]interface{}{}
163-
164-
if obj.Max != nil {
165-
result["max"] = int(*obj.Max)
166-
}
167-
168-
if obj.Min != nil {
169-
result["min"] = int(*obj.Min)
170-
}
171-
172-
return result
173-
}

‎internal/service/core/core_image_shapes_data_source.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,31 @@ func (s *CoreImageShapesDataSourceCrud) SetData() error {
180180

181181
return nil
182182
}
183+
184+
func ImageMemoryConstraintsToMap(obj *oci_core.ImageMemoryConstraints) map[string]interface{} {
185+
result := map[string]interface{}{}
186+
187+
if obj.MaxInGBs != nil {
188+
result["max_in_gbs"] = int(*obj.MaxInGBs)
189+
}
190+
191+
if obj.MinInGBs != nil {
192+
result["min_in_gbs"] = int(*obj.MinInGBs)
193+
}
194+
195+
return result
196+
}
197+
198+
func ImageOcpuConstraintsToMap(obj *oci_core.ImageOcpuConstraints) map[string]interface{} {
199+
result := map[string]interface{}{}
200+
201+
if obj.Max != nil {
202+
result["max"] = int(*obj.Max)
203+
}
204+
205+
if obj.Min != nil {
206+
result["min"] = int(*obj.Min)
207+
}
208+
209+
return result
210+
}

‎internal/service/core/core_volume_group_replica_data_source.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,3 @@ func (s *CoreVolumeGroupReplicaDataSourceCrud) SetData() error {
178178

179179
return nil
180180
}
181-
182-
func MemberReplicaToMap(obj oci_core.MemberReplica) map[string]interface{} {
183-
result := map[string]interface{}{}
184-
185-
result["membership_state"] = string(obj.MembershipState)
186-
187-
if obj.VolumeReplicaId != nil {
188-
result["volume_replica_id"] = string(*obj.VolumeReplicaId)
189-
}
190-
191-
return result
192-
}

0 commit comments

Comments
 (0)