Skip to content

Commit 213cafe

Browse files
committed
Bug Fix - Commented out FAMS-related code due to breaking changes in existing APIs.
1 parent af231df commit 213cafe

File tree

41 files changed

+16585
-16585
lines changed

Some content is hidden

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

41 files changed

+16585
-16585
lines changed

internal/integrationtest/fleet_apps_management_fleet_credential_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func getFleetAppsManagementFleetCredentialIds(compartment string) ([]string, err
308308
fleetAppsManagementClient := acctest.GetTestClients(&schema.ResourceData{}).FleetAppsManagementClient()
309309

310310
listFleetCredentialsRequest := oci_fleet_apps_management.ListFleetCredentialsRequest{}
311-
listFleetCredentialsRequest.CompartmentId = &compartmentId
311+
//listFleetCredentialsRequest.CompartmentId = &compartmentId
312312

313313
fleetIds, error := getFleetAppsManagementFleetIds(compartment)
314314
if error != nil {

internal/integrationtest/fleet_apps_management_fleet_property_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func getFleetAppsManagementFleetPropertyIds(compartment string) ([]string, error
246246
fleetAppsManagementClient := acctest.GetTestClients(&schema.ResourceData{}).FleetAppsManagementClient()
247247

248248
listFleetPropertiesRequest := oci_fleet_apps_management.ListFleetPropertiesRequest{}
249-
listFleetPropertiesRequest.CompartmentId = &compartmentId
249+
//listFleetPropertiesRequest.CompartmentId = &compartmentId
250250

251251
fleetIds, error := getFleetAppsManagementFleetIds(compartment)
252252
if error != nil {

internal/service/fleet_apps_management/fleet_apps_management_compliance_policy_rule_data_source.go

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -3,128 +3,128 @@
33

44
package fleet_apps_management
55

6-
import (
7-
"context"
8-
9-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10-
oci_fleet_apps_management "github.com/oracle/oci-go-sdk/v65/fleetappsmanagement"
11-
12-
"github.com/oracle/terraform-provider-oci/internal/client"
13-
"github.com/oracle/terraform-provider-oci/internal/tfresource"
14-
)
15-
16-
func FleetAppsManagementCompliancePolicyRuleDataSource() *schema.Resource {
17-
fieldMap := make(map[string]*schema.Schema)
18-
fieldMap["compliance_policy_rule_id"] = &schema.Schema{
19-
Type: schema.TypeString,
20-
Required: true,
21-
}
22-
return tfresource.GetSingularDataSourceItemSchema(FleetAppsManagementCompliancePolicyRuleResource(), fieldMap, readSingularFleetAppsManagementCompliancePolicyRule)
23-
}
24-
25-
func readSingularFleetAppsManagementCompliancePolicyRule(d *schema.ResourceData, m interface{}) error {
26-
sync := &FleetAppsManagementCompliancePolicyRuleDataSourceCrud{}
27-
sync.D = d
28-
sync.Client = m.(*client.OracleClients).FleetAppsManagementAdminClient()
29-
30-
return tfresource.ReadResource(sync)
31-
}
32-
33-
type FleetAppsManagementCompliancePolicyRuleDataSourceCrud struct {
34-
D *schema.ResourceData
35-
Client *oci_fleet_apps_management.FleetAppsManagementAdminClient
36-
Res *oci_fleet_apps_management.GetCompliancePolicyRuleResponse
37-
}
38-
39-
func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) VoidState() {
40-
s.D.SetId("")
41-
}
42-
43-
func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) Get() error {
44-
request := oci_fleet_apps_management.GetCompliancePolicyRuleRequest{}
45-
46-
if compliancePolicyRuleId, ok := s.D.GetOkExists("compliance_policy_rule_id"); ok {
47-
tmp := compliancePolicyRuleId.(string)
48-
request.CompliancePolicyRuleId = &tmp
49-
}
50-
51-
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "fleet_apps_management")
52-
53-
response, err := s.Client.GetCompliancePolicyRule(context.Background(), request)
54-
if err != nil {
55-
return err
56-
}
57-
58-
s.Res = &response
59-
return nil
60-
}
61-
62-
func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) SetData() error {
63-
if s.Res == nil {
64-
return nil
65-
}
66-
67-
s.D.SetId(*s.Res.Id)
68-
69-
if s.Res.CompartmentId != nil {
70-
s.D.Set("compartment_id", *s.Res.CompartmentId)
71-
}
72-
73-
if s.Res.CompliancePolicyId != nil {
74-
s.D.Set("compliance_policy_id", *s.Res.CompliancePolicyId)
75-
}
76-
77-
if s.Res.DefinedTags != nil {
78-
s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
79-
}
80-
81-
if s.Res.DisplayName != nil {
82-
s.D.Set("display_name", *s.Res.DisplayName)
83-
}
84-
85-
s.D.Set("freeform_tags", s.Res.FreeformTags)
86-
87-
if s.Res.GracePeriod != nil {
88-
s.D.Set("grace_period", *s.Res.GracePeriod)
89-
}
90-
91-
if s.Res.LifecycleDetails != nil {
92-
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
93-
}
94-
95-
if s.Res.PatchSelection != nil {
96-
patchSelectionArray := []interface{}{}
97-
if patchSelectionMap := PatchSelectionDetailsToMap(&s.Res.PatchSelection); patchSelectionMap != nil {
98-
patchSelectionArray = append(patchSelectionArray, patchSelectionMap)
99-
}
100-
s.D.Set("patch_selection", patchSelectionArray)
101-
} else {
102-
s.D.Set("patch_selection", nil)
103-
}
104-
105-
s.D.Set("patch_type", s.Res.PatchType)
106-
107-
if s.Res.ProductVersion != nil {
108-
s.D.Set("product_version", []interface{}{ProductVersionDetailsToMap(s.Res.ProductVersion)})
109-
} else {
110-
s.D.Set("product_version", nil)
111-
}
112-
113-
s.D.Set("severity", s.Res.Severity)
114-
115-
s.D.Set("state", s.Res.LifecycleState)
116-
117-
if s.Res.SystemTags != nil {
118-
s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
119-
}
120-
121-
if s.Res.TimeCreated != nil {
122-
s.D.Set("time_created", s.Res.TimeCreated.String())
123-
}
124-
125-
if s.Res.TimeUpdated != nil {
126-
s.D.Set("time_updated", s.Res.TimeUpdated.String())
127-
}
128-
129-
return nil
130-
}
6+
//import (
7+
// "context"
8+
//
9+
// "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10+
// oci_fleet_apps_management "github.com/oracle/oci-go-sdk/v65/fleetappsmanagement"
11+
//
12+
// "github.com/oracle/terraform-provider-oci/internal/client"
13+
// "github.com/oracle/terraform-provider-oci/internal/tfresource"
14+
//)
15+
//
16+
//func FleetAppsManagementCompliancePolicyRuleDataSource() *schema.Resource {
17+
// fieldMap := make(map[string]*schema.Schema)
18+
// fieldMap["compliance_policy_rule_id"] = &schema.Schema{
19+
// Type: schema.TypeString,
20+
// Required: true,
21+
// }
22+
// return tfresource.GetSingularDataSourceItemSchema(FleetAppsManagementCompliancePolicyRuleResource(), fieldMap, readSingularFleetAppsManagementCompliancePolicyRule)
23+
//}
24+
//
25+
//func readSingularFleetAppsManagementCompliancePolicyRule(d *schema.ResourceData, m interface{}) error {
26+
// sync := &FleetAppsManagementCompliancePolicyRuleDataSourceCrud{}
27+
// sync.D = d
28+
// sync.Client = m.(*client.OracleClients).FleetAppsManagementAdminClient()
29+
//
30+
// return tfresource.ReadResource(sync)
31+
//}
32+
//
33+
//type FleetAppsManagementCompliancePolicyRuleDataSourceCrud struct {
34+
// D *schema.ResourceData
35+
// Client *oci_fleet_apps_management.FleetAppsManagementAdminClient
36+
// Res *oci_fleet_apps_management.GetCompliancePolicyRuleResponse
37+
//}
38+
//
39+
//func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) VoidState() {
40+
// s.D.SetId("")
41+
//}
42+
//
43+
//func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) Get() error {
44+
// request := oci_fleet_apps_management.GetCompliancePolicyRuleRequest{}
45+
//
46+
// if compliancePolicyRuleId, ok := s.D.GetOkExists("compliance_policy_rule_id"); ok {
47+
// tmp := compliancePolicyRuleId.(string)
48+
// request.CompliancePolicyRuleId = &tmp
49+
// }
50+
//
51+
// request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "fleet_apps_management")
52+
//
53+
// response, err := s.Client.GetCompliancePolicyRule(context.Background(), request)
54+
// if err != nil {
55+
// return err
56+
// }
57+
//
58+
// s.Res = &response
59+
// return nil
60+
//}
61+
//
62+
//func (s *FleetAppsManagementCompliancePolicyRuleDataSourceCrud) SetData() error {
63+
// if s.Res == nil {
64+
// return nil
65+
// }
66+
//
67+
// s.D.SetId(*s.Res.Id)
68+
//
69+
// if s.Res.CompartmentId != nil {
70+
// s.D.Set("compartment_id", *s.Res.CompartmentId)
71+
// }
72+
//
73+
// if s.Res.CompliancePolicyId != nil {
74+
// s.D.Set("compliance_policy_id", *s.Res.CompliancePolicyId)
75+
// }
76+
//
77+
// if s.Res.DefinedTags != nil {
78+
// s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
79+
// }
80+
//
81+
// if s.Res.DisplayName != nil {
82+
// s.D.Set("display_name", *s.Res.DisplayName)
83+
// }
84+
//
85+
// s.D.Set("freeform_tags", s.Res.FreeformTags)
86+
//
87+
// if s.Res.GracePeriod != nil {
88+
// s.D.Set("grace_period", *s.Res.GracePeriod)
89+
// }
90+
//
91+
// if s.Res.LifecycleDetails != nil {
92+
// s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
93+
// }
94+
//
95+
// if s.Res.PatchSelection != nil {
96+
// patchSelectionArray := []interface{}{}
97+
// if patchSelectionMap := PatchSelectionDetailsToMap(&s.Res.PatchSelection); patchSelectionMap != nil {
98+
// patchSelectionArray = append(patchSelectionArray, patchSelectionMap)
99+
// }
100+
// s.D.Set("patch_selection", patchSelectionArray)
101+
// } else {
102+
// s.D.Set("patch_selection", nil)
103+
// }
104+
//
105+
// s.D.Set("patch_type", s.Res.PatchType)
106+
//
107+
// if s.Res.ProductVersion != nil {
108+
// s.D.Set("product_version", []interface{}{ProductVersionDetailsToMap(s.Res.ProductVersion)})
109+
// } else {
110+
// s.D.Set("product_version", nil)
111+
// }
112+
//
113+
// s.D.Set("severity", s.Res.Severity)
114+
//
115+
// s.D.Set("state", s.Res.LifecycleState)
116+
//
117+
// if s.Res.SystemTags != nil {
118+
// s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
119+
// }
120+
//
121+
// if s.Res.TimeCreated != nil {
122+
// s.D.Set("time_created", s.Res.TimeCreated.String())
123+
// }
124+
//
125+
// if s.Res.TimeUpdated != nil {
126+
// s.D.Set("time_updated", s.Res.TimeUpdated.String())
127+
// }
128+
//
129+
// return nil
130+
//}

0 commit comments

Comments
 (0)