Skip to content

Commit 371ded3

Browse files
DCL Teamcopybara-github
DCL Team
authored and
copybara-github
committed
Automated DCL import.
 - 97aa43c2536b53577c0074b971205ebc952379c0 Automatic import from cloud_mmv2_dcl_20231128_1231_RC00 by DCL Team <[email protected]> GitOrigin-RevId: 97aa43c2536b53577c0074b971205ebc952379c0
1 parent a12fc1f commit 371ded3

26 files changed

+64
-64
lines changed

‎dcl/transport.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"encoding/json"
2020
"fmt"
21-
"io/ioutil"
21+
"io"
2222
"net/http"
2323
"net/url"
2424
"regexp"
@@ -123,7 +123,7 @@ func SendRequest(ctx context.Context, c *Config, verb, url string, body *bytes.B
123123
start := time.Now()
124124
err = Do(ctx, func(ctx context.Context) (*RetryDetails, error) {
125125
// Reset req body before http call.
126-
req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
126+
req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
127127
res, err = httpClient.Do(req)
128128
if err != nil {
129129
return nil, err
@@ -137,13 +137,13 @@ func SendRequest(ctx context.Context, c *Config, verb, url string, body *bytes.B
137137
}
138138
return nil, err
139139
}
140-
req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
140+
req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
141141
return &RetryDetails{Request: req.Clone(ctx), Response: res}, err
142142
}, retryProvider)
143143
if err != nil {
144144
return nil, err
145145
}
146-
req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
146+
req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
147147
return &RetryDetails{Request: req, Response: res}, nil
148148
}
149149

@@ -230,7 +230,7 @@ func URL(urlpath, basePath, userPath string, params map[string]interface{}) stri
230230
// it as unstructured JSON in a map[string]interface{}.
231231
func ResponseBodyAsJSON(retry *RetryDetails) (map[string]interface{}, error) {
232232
defer retry.Response.Body.Close()
233-
b, err := ioutil.ReadAll(retry.Response.Body)
233+
b, err := io.ReadAll(retry.Response.Body)
234234
if err != nil {
235235
return nil, err
236236
}

‎python/connector/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package main
1515

1616
import (
1717
"bytes"
18-
"io/ioutil"
18+
"io"
1919
"net/http"
2020
"net/url"
2121
"strconv"
@@ -173,6 +173,6 @@ func makeHTTPRequest(request *connectorpb.UnaryCallRequest) (*http.Request, erro
173173
},
174174
Trailer: make(http.Header),
175175
ContentLength: -1,
176-
Body: ioutil.NopCloser(bytes.NewReader(lpm)),
176+
Body: io.NopCloser(bytes.NewReader(lpm)),
177177
}, nil
178178
}

‎services/google/apigee/alpha/apigee_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -59,7 +59,7 @@ func (c *Client) listOrganizationRaw(ctx context.Context, r *Organization, pageT
5959
return nil, err
6060
}
6161
defer resp.Response.Body.Close()
62-
return ioutil.ReadAll(resp.Response.Body)
62+
return io.ReadAll(resp.Response.Body)
6363
}
6464

6565
type listOrganizationOperation struct {
@@ -207,7 +207,7 @@ func (c *Client) listEnvironmentRaw(ctx context.Context, r *Environment, pageTok
207207
return nil, err
208208
}
209209
defer resp.Response.Body.Close()
210-
return ioutil.ReadAll(resp.Response.Body)
210+
return io.ReadAll(resp.Response.Body)
211211
}
212212

213213
// listEnvironment is needed because the ListEnvironments method returns a list of environment names rather than objects.

‎services/google/apigee/apigee_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -59,7 +59,7 @@ func (c *Client) listOrganizationRaw(ctx context.Context, r *Organization, pageT
5959
return nil, err
6060
}
6161
defer resp.Response.Body.Close()
62-
return ioutil.ReadAll(resp.Response.Body)
62+
return io.ReadAll(resp.Response.Body)
6363
}
6464

6565
type listOrganizationOperation struct {
@@ -207,7 +207,7 @@ func (c *Client) listEnvironmentRaw(ctx context.Context, r *Environment, pageTok
207207
return nil, err
208208
}
209209
defer resp.Response.Body.Close()
210-
return ioutil.ReadAll(resp.Response.Body)
210+
return io.ReadAll(resp.Response.Body)
211211
}
212212

213213
// listEnvironment is needed because the ListEnvironments method returns a list of environment names rather than objects.

‎services/google/apigee/beta/apigee_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -59,7 +59,7 @@ func (c *Client) listOrganizationRaw(ctx context.Context, r *Organization, pageT
5959
return nil, err
6060
}
6161
defer resp.Response.Body.Close()
62-
return ioutil.ReadAll(resp.Response.Body)
62+
return io.ReadAll(resp.Response.Body)
6363
}
6464

6565
type listOrganizationOperation struct {
@@ -207,7 +207,7 @@ func (c *Client) listEnvironmentRaw(ctx context.Context, r *Environment, pageTok
207207
return nil, err
208208
}
209209
defer resp.Response.Body.Close()
210-
return ioutil.ReadAll(resp.Response.Body)
210+
return io.ReadAll(resp.Response.Body)
211211
}
212212

213213
// listEnvironment is needed because the ListEnvironments method returns a list of environment names rather than objects.

‎services/google/apikeys/alpha/apikeys_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"bytes"
1919
"context"
2020
"encoding/json"
21-
"io/ioutil"
21+
"io"
2222
"time"
2323

2424
"google.golang.org/api/googleapi"
@@ -45,7 +45,7 @@ func (c *Client) getKeyStringRaw(ctx context.Context, r *Key) ([]byte, error) {
4545
return nil, err
4646
}
4747
defer resp.Response.Body.Close()
48-
b, err := ioutil.ReadAll(resp.Response.Body)
48+
b, err := io.ReadAll(resp.Response.Body)
4949
if err != nil {
5050
return nil, err
5151
}
@@ -64,7 +64,7 @@ func (c *Client) getKeyRaw(ctx context.Context, r *Key) ([]byte, error) {
6464
return nil, err
6565
}
6666
defer resp.Response.Body.Close()
67-
b, err := ioutil.ReadAll(resp.Response.Body)
67+
b, err := io.ReadAll(resp.Response.Body)
6868
if err != nil {
6969
return nil, err
7070
}

‎services/google/apikeys/apikeys_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"bytes"
1919
"context"
2020
"encoding/json"
21-
"io/ioutil"
21+
"io"
2222
"time"
2323

2424
"google.golang.org/api/googleapi"
@@ -45,7 +45,7 @@ func (c *Client) getKeyStringRaw(ctx context.Context, r *Key) ([]byte, error) {
4545
return nil, err
4646
}
4747
defer resp.Response.Body.Close()
48-
b, err := ioutil.ReadAll(resp.Response.Body)
48+
b, err := io.ReadAll(resp.Response.Body)
4949
if err != nil {
5050
return nil, err
5151
}
@@ -64,7 +64,7 @@ func (c *Client) getKeyRaw(ctx context.Context, r *Key) ([]byte, error) {
6464
return nil, err
6565
}
6666
defer resp.Response.Body.Close()
67-
b, err := ioutil.ReadAll(resp.Response.Body)
67+
b, err := io.ReadAll(resp.Response.Body)
6868
if err != nil {
6969
return nil, err
7070
}

‎services/google/apikeys/beta/apikeys_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"bytes"
1919
"context"
2020
"encoding/json"
21-
"io/ioutil"
21+
"io"
2222
"time"
2323

2424
"google.golang.org/api/googleapi"
@@ -45,7 +45,7 @@ func (c *Client) getKeyStringRaw(ctx context.Context, r *Key) ([]byte, error) {
4545
return nil, err
4646
}
4747
defer resp.Response.Body.Close()
48-
b, err := ioutil.ReadAll(resp.Response.Body)
48+
b, err := io.ReadAll(resp.Response.Body)
4949
if err != nil {
5050
return nil, err
5151
}
@@ -64,7 +64,7 @@ func (c *Client) getKeyRaw(ctx context.Context, r *Key) ([]byte, error) {
6464
return nil, err
6565
}
6666
defer resp.Response.Body.Close()
67-
b, err := ioutil.ReadAll(resp.Response.Body)
67+
b, err := io.ReadAll(resp.Response.Body)
6868
if err != nil {
6969
return nil, err
7070
}

‎services/google/assuredworkloads/alpha/assuredworkloads_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -47,7 +47,7 @@ func lifecycleState(ctx context.Context, client *Client, url string) (string, er
4747
return "", err
4848
}
4949
defer resp.Response.Body.Close()
50-
b, err := ioutil.ReadAll(resp.Response.Body)
50+
b, err := io.ReadAll(resp.Response.Body)
5151
if err != nil {
5252
return "", err
5353
}

‎services/google/assuredworkloads/assuredworkloads_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -47,7 +47,7 @@ func lifecycleState(ctx context.Context, client *Client, url string) (string, er
4747
return "", err
4848
}
4949
defer resp.Response.Body.Close()
50-
b, err := ioutil.ReadAll(resp.Response.Body)
50+
b, err := io.ReadAll(resp.Response.Body)
5151
if err != nil {
5252
return "", err
5353
}

‎services/google/assuredworkloads/beta/assuredworkloads_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323

2424
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
2525
)
@@ -47,7 +47,7 @@ func lifecycleState(ctx context.Context, client *Client, url string) (string, er
4747
return "", err
4848
}
4949
defer resp.Response.Body.Close()
50-
b, err := ioutil.ReadAll(resp.Response.Body)
50+
b, err := io.ReadAll(resp.Response.Body)
5151
if err != nil {
5252
return "", err
5353
}

‎services/google/billingbudgets/alpha/billingbudgets_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"strings"
2424
"time"
2525

@@ -170,7 +170,7 @@ func flattenBudgetFilterProjects(c *Client, projects interface{}, _ *Budget) []s
170170
return nil
171171
}
172172
defer resp.Response.Body.Close()
173-
b, err := ioutil.ReadAll(resp.Response.Body)
173+
b, err := io.ReadAll(resp.Response.Body)
174174
if err != nil {
175175
return nil
176176
}

‎services/google/billingbudgets/beta/billingbudgets_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"strings"
2424
"time"
2525

@@ -170,7 +170,7 @@ func flattenBudgetFilterProjects(c *Client, projects interface{}, _ *Budget) []s
170170
return nil
171171
}
172172
defer resp.Response.Body.Close()
173-
b, err := ioutil.ReadAll(resp.Response.Body)
173+
b, err := io.ReadAll(resp.Response.Body)
174174
if err != nil {
175175
return nil
176176
}

‎services/google/billingbudgets/billingbudgets_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"strings"
2424
"time"
2525

@@ -170,7 +170,7 @@ func flattenBudgetFilterProjects(c *Client, projects interface{}, _ *Budget) []s
170170
return nil
171171
}
172172
defer resp.Response.Body.Close()
173-
b, err := ioutil.ReadAll(resp.Response.Body)
173+
b, err := io.ReadAll(resp.Response.Body)
174174
if err != nil {
175175
return nil
176176
}

‎services/google/gkehub/alpha/hub_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"strings"
2525

2626
"google.golang.org/api/googleapi"
@@ -40,7 +40,7 @@ func getMembershipSpecs(ctx context.Context, r *FeatureMembership, c *Client) (m
4040
return nil, err
4141
}
4242
defer resp.Response.Body.Close()
43-
b, err := ioutil.ReadAll(resp.Response.Body)
43+
b, err := io.ReadAll(resp.Response.Body)
4444
if err != nil {
4545
return nil, err
4646
}

‎services/google/gkehub/beta/hub_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"strings"
2525

2626
"google.golang.org/api/googleapi"
@@ -40,7 +40,7 @@ func getMembershipSpecs(ctx context.Context, r *FeatureMembership, c *Client) (m
4040
return nil, err
4141
}
4242
defer resp.Response.Body.Close()
43-
b, err := ioutil.ReadAll(resp.Response.Body)
43+
b, err := io.ReadAll(resp.Response.Body)
4444
if err != nil {
4545
return nil, err
4646
}

‎services/google/gkehub/hub_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"strings"
2525

2626
"google.golang.org/api/googleapi"
@@ -40,7 +40,7 @@ func getMembershipSpecs(ctx context.Context, r *FeatureMembership, c *Client) (m
4040
return nil, err
4141
}
4242
defer resp.Response.Body.Close()
43-
b, err := ioutil.ReadAll(resp.Response.Body)
43+
b, err := io.ReadAll(resp.Response.Body)
4444
if err != nil {
4545
return nil, err
4646
}

0 commit comments

Comments
 (0)