Skip to content

Commit 8eccc57

Browse files
mikejihbecodycushing
authored andcommitted
Collapse _crud files into the main resource/datasource files
1 parent ff24bab commit 8eccc57

File tree

167 files changed

+5502
-6178
lines changed

Some content is hidden

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

167 files changed

+5502
-6178
lines changed

core_console_history_data_datasource.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
package main
44

55
import (
6+
"time"
7+
68
"github.com/hashicorp/terraform/helper/schema"
79

10+
"github.com/MustWin/baremetal-sdk-go"
811
"github.com/oracle/terraform-provider-baremetal/client"
912
"github.com/oracle/terraform-provider-baremetal/crud"
1013
)
@@ -41,3 +44,25 @@ func readConsoleHistoryData(d *schema.ResourceData, m interface{}) (e error) {
4144

4245
return crud.ReadResource(reader)
4346
}
47+
48+
type ConsoleHistoryDataDatasourceCrud struct {
49+
crud.BaseCrud
50+
ConsoleHistoryData *baremetal.ConsoleHistoryData
51+
}
52+
53+
func (res *ConsoleHistoryDataDatasourceCrud) Get() (e error) {
54+
id := res.D.Get("console_history_id").(string)
55+
56+
opts := &baremetal.ConsoleHistoryDataOptions{}
57+
opts.Length = uint64(res.D.Get("length").(int))
58+
opts.Offset = uint64(res.D.Get("offset").(int))
59+
60+
res.ConsoleHistoryData, e = res.Client.ShowConsoleHistoryData(id, opts)
61+
62+
return
63+
}
64+
65+
func (res *ConsoleHistoryDataDatasourceCrud) SetData() {
66+
res.D.SetId(time.Now().UTC().String())
67+
res.D.Set("data", res.ConsoleHistoryData.Data)
68+
}

core_console_history_data_datasource_crud.go

Lines changed: 0 additions & 33 deletions
This file was deleted.

core_console_history_resource.go

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/hashicorp/terraform/helper/schema"
99

10+
"github.com/MustWin/baremetal-sdk-go"
1011
"github.com/oracle/terraform-provider-baremetal/client"
1112
"github.com/oracle/terraform-provider-baremetal/crud"
1213
)
@@ -74,3 +75,46 @@ func readConsoleHistory(d *schema.ResourceData, m interface{}) (e error) {
7475
func deleteConsoleHistory(d *schema.ResourceData, m interface{}) (e error) {
7576
return fmt.Errorf("console history resource: console history %v cannot be deleted", d.Id())
7677
}
78+
79+
type ConsoleHistoryResourceCrud struct {
80+
crud.BaseCrud
81+
Res *baremetal.ConsoleHistoryMetadata
82+
}
83+
84+
func (s *ConsoleHistoryResourceCrud) ID() string {
85+
return s.Res.ID
86+
}
87+
88+
func (s *ConsoleHistoryResourceCrud) CreatedPending() []string {
89+
return []string{baremetal.ResourceRequested}
90+
}
91+
92+
func (s *ConsoleHistoryResourceCrud) CreatedTarget() []string {
93+
return []string{baremetal.ResourceSucceeded}
94+
}
95+
96+
func (s *ConsoleHistoryResourceCrud) State() string {
97+
return s.Res.State
98+
}
99+
100+
func (s *ConsoleHistoryResourceCrud) Create() (e error) {
101+
instanceID := s.D.Get("instance_id").(string)
102+
103+
s.Res, e = s.Client.CaptureConsoleHistory(instanceID, nil)
104+
105+
return
106+
}
107+
108+
func (s *ConsoleHistoryResourceCrud) Get() (e error) {
109+
s.Res, e = s.Client.GetConsoleHistory(s.D.Id())
110+
return
111+
}
112+
113+
func (s *ConsoleHistoryResourceCrud) SetData() {
114+
s.D.Set("availability_domain", s.Res.AvailabilityDomain)
115+
s.D.Set("compartment_id", s.Res.CompartmentID)
116+
s.D.Set("display_name", s.Res.DisplayName)
117+
s.D.Set("instance_id", s.Res.InstanceID)
118+
s.D.Set("state", s.Res.State)
119+
s.D.Set("time_created", s.Res.TimeCreated.String())
120+
}

core_console_history_resource_crud.go

Lines changed: 0 additions & 52 deletions
This file was deleted.

core_cpe_datasource.go

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
package main
44

55
import (
6+
"time"
7+
68
"github.com/hashicorp/terraform/helper/schema"
79

10+
"github.com/MustWin/baremetal-sdk-go"
811
"github.com/oracle/terraform-provider-baremetal/client"
912
"github.com/oracle/terraform-provider-baremetal/crud"
13+
"github.com/oracle/terraform-provider-baremetal/options"
1014
)
1115

1216
func CpeDatasource() *schema.Resource {
@@ -41,3 +45,55 @@ func readCpeList(d *schema.ResourceData, m interface{}) (e error) {
4145
return crud.ReadResource(reader)
4246

4347
}
48+
49+
type CPEDatasourceCrud struct {
50+
crud.BaseCrud
51+
Resource *baremetal.ListCpes
52+
}
53+
54+
func (s *CPEDatasourceCrud) Get() (e error) {
55+
compartmentID := s.D.Get("compartment_id").(string)
56+
57+
opts := &baremetal.ListOptions{}
58+
options.SetListOptions(s.D, opts)
59+
60+
s.Resource = &baremetal.ListCpes{Cpes: []baremetal.Cpe{}}
61+
62+
for {
63+
var list *baremetal.ListCpes
64+
if list, e = s.Client.ListCpes(compartmentID, opts); e != nil {
65+
break
66+
}
67+
68+
s.Resource.Cpes = append(s.Resource.Cpes, list.Cpes...)
69+
70+
if hasNextPage := options.SetNextPageOption(list.NextPage, &opts.PageListOptions); !hasNextPage {
71+
break
72+
}
73+
}
74+
75+
return
76+
}
77+
78+
func (s *CPEDatasourceCrud) SetData() {
79+
if s.Resource != nil {
80+
s.D.SetId(time.Now().UTC().String())
81+
82+
cpes := []map[string]interface{}{}
83+
84+
for _, v := range s.Resource.Cpes {
85+
cpe := map[string]interface{}{
86+
"id": v.ID,
87+
"compartment_id": v.CompartmentID,
88+
"display_name": v.DisplayName,
89+
"ip_address": v.IPAddress,
90+
"time_created": v.TimeCreated.String(),
91+
}
92+
93+
cpes = append(cpes, cpe)
94+
}
95+
96+
s.D.Set("cpes", cpes)
97+
98+
}
99+
}

core_cpe_datasource_crud.go

Lines changed: 0 additions & 64 deletions
This file was deleted.

core_cpe_resource.go

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package main
55
import (
66
"github.com/hashicorp/terraform/helper/schema"
77

8+
"github.com/MustWin/baremetal-sdk-go"
89
"github.com/oracle/terraform-provider-baremetal/client"
910
"github.com/oracle/terraform-provider-baremetal/crud"
1011
)
@@ -79,3 +80,54 @@ func deleteCpe(d *schema.ResourceData, m interface{}) (e error) {
7980
sync.Client = client
8081
return sync.Delete()
8182
}
83+
84+
type CpeResourceCrud struct {
85+
crud.BaseCrud
86+
Resource *baremetal.Cpe
87+
}
88+
89+
func (s *CpeResourceCrud) ID() string {
90+
return s.Resource.ID
91+
}
92+
93+
func (s *CpeResourceCrud) Create() (e error) {
94+
compartmentID := s.D.Get("compartment_id").(string)
95+
ipAddress := s.D.Get("ip_address").(string)
96+
97+
opts := &baremetal.CreateOptions{}
98+
displayName, ok := s.D.GetOk("display_name")
99+
if ok {
100+
opts.DisplayName = displayName.(string)
101+
}
102+
103+
s.Resource, e = s.Client.CreateCpe(compartmentID, ipAddress, opts)
104+
return
105+
}
106+
107+
func (s *CpeResourceCrud) Get() (e error) {
108+
s.Resource, e = s.Client.GetCpe(s.D.Id())
109+
return
110+
}
111+
112+
func (s *CpeResourceCrud) Update() (e error) {
113+
opts := &baremetal.IfMatchDisplayNameOptions{}
114+
compartmentID := s.D.Get("compartment_id").(string)
115+
displayName, ok := s.D.GetOk("display_name")
116+
if ok {
117+
opts.DisplayName = displayName.(string)
118+
}
119+
120+
s.Resource, e = s.Client.UpdateCpe(compartmentID, opts)
121+
return
122+
}
123+
124+
func (s *CpeResourceCrud) SetData() {
125+
s.D.Set("compartment_id", s.Resource.CompartmentID)
126+
s.D.Set("display_name", s.Resource.DisplayName)
127+
s.D.Set("ip_address", s.Resource.IPAddress)
128+
s.D.Set("time_created", s.Resource.TimeCreated.String())
129+
}
130+
131+
func (s *CpeResourceCrud) Delete() (e error) {
132+
return s.Client.DeleteCpe(s.D.Id(), nil)
133+
}

0 commit comments

Comments
 (0)