Skip to content

Commit 4aaf178

Browse files
committed
Update spec for identity and fix cost tracking tags' paging
1 parent 6a11d70 commit 4aaf178

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

oci/identity_cost_tracking_tags_data_source.go

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,27 +145,16 @@ func (s *IdentityCostTrackingTagsDataSourceCrud) Get() error {
145145
}
146146

147147
s.Res = &response
148-
// TODO- remove this custom code handling paging once service fixes Opc-Next-Page in spec
149-
if s.Res != nil && s.Res.RawResponse != nil {
150-
rawResponse := s.Res.RawResponse
151-
nextPage := rawResponse.Header.Get(OpcNextPageHeader)
152-
request.Page = &nextPage
153-
154-
for request.Page != nil && *request.Page != "" {
155-
listResponse, err := s.Client.ListCostTrackingTags(context.Background(), request)
156-
if err != nil {
157-
return err
158-
}
159-
160-
s.Res.Items = append(s.Res.Items, listResponse.Items...)
161-
if listResponse.RawResponse != nil {
162-
nextPage = listResponse.RawResponse.Header.Get(OpcNextPageHeader)
163-
request.Page = &nextPage
164-
} else {
165-
request.Page = nil
166-
}
148+
request.Page = s.Res.OpcNextPage
167149

150+
for request.Page != nil {
151+
listResponse, err := s.Client.ListCostTrackingTags(context.Background(), request)
152+
if err != nil {
153+
return err
168154
}
155+
156+
s.Res.Items = append(s.Res.Items, listResponse.Items...)
157+
request.Page = listResponse.OpcNextPage
169158
}
170159

171160
return nil

0 commit comments

Comments
 (0)