align naming, 'TeamsAccountConnectivitySettings' to 'TeamsConnectivit…

…ySettings'
cloudflare · May 24, 2024 · 52d6a77 · 52d6a77
1 parent b51c3aa
commit 52d6a77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/teams_accounts.go b/teams_accounts.go
@@ -147,14 +147,14 @@ type TeamsLoggingSettingsResponse struct {
 	Result TeamsLoggingSettings `json:"result"`
 }
 
-type TeamsAccountConnectivitySettings struct {
+type TeamsConnectivitySettings struct {
 	ICMPProxyEnabled   *bool `json:"icmp_proxy_enabled"`
 	OfframpWarpEnabled *bool `json:"offramp_warp_enabled"`
 }
 
 type TeamsAccountConnectivitySettingsResponse struct {
 	Response
-	Result TeamsAccountConnectivitySettings `json:"result"`
+	Result TeamsConnectivitySettings `json:"result"`
 }
 
 // TeamsAccount returns teams account information with internal and external ID.
@@ -240,18 +240,18 @@ func (api *API) TeamsAccountLoggingConfiguration(ctx context.Context, accountID
 // TeamsAccountConnectivityConfiguration returns zero trust account connectivity settings.
 //
 // API reference: https://developers.cloudflare.com/api/operations/zero-trust-accounts-get-connectivity-settings
-func (api *API) TeamsAccountConnectivityConfiguration(ctx context.Context, accountID string) (TeamsAccountConnectivitySettings, error) {
+func (api *API) TeamsAccountConnectivityConfiguration(ctx context.Context, accountID string) (TeamsConnectivitySettings, error) {
 	uri := fmt.Sprintf("/accounts/%s/zerotrust/connectivity_settings", accountID)
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return TeamsAccountConnectivitySettings{}, err
+		return TeamsConnectivitySettings{}, err
 	}
 
 	var teamsConnectivityResponse TeamsAccountConnectivitySettingsResponse
 	err = json.Unmarshal(res, &teamsConnectivityResponse)
 	if err != nil {
-		return TeamsAccountConnectivitySettings{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
+		return TeamsConnectivitySettings{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return teamsConnectivityResponse.Result, nil
@@ -320,18 +320,18 @@ func (api *API) TeamsAccountDeviceUpdateConfiguration(ctx context.Context, accou
 // TeamsAccountConnectivityUpdateConfiguration updates zero trust account connectivity settings.
 //
 // API reference: https://developers.cloudflare.com/api/operations/zero-trust-accounts-patch-connectivity-settings
-func (api *API) TeamsAccountConnectivityUpdateConfiguration(ctx context.Context, accountID string, settings TeamsAccountConnectivitySettings) (TeamsAccountConnectivitySettings, error) {
+func (api *API) TeamsAccountConnectivityUpdateConfiguration(ctx context.Context, accountID string, settings TeamsConnectivitySettings) (TeamsConnectivitySettings, error) {
 	uri := fmt.Sprintf("/accounts/%s/zerotrust/connectivity_settings", accountID)
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, settings)
 	if err != nil {
-		return TeamsAccountConnectivitySettings{}, err
+		return TeamsConnectivitySettings{}, err
 	}
 
 	var teamsConnectivityResponse TeamsAccountConnectivitySettingsResponse
 	err = json.Unmarshal(res, &teamsConnectivityResponse)
 	if err != nil {
-		return TeamsAccountConnectivitySettings{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
+		return TeamsConnectivitySettings{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return teamsConnectivityResponse.Result, nil

diff --git a/teams_accounts_test.go b/teams_accounts_test.go
@@ -361,7 +361,7 @@ func TestTeamsAccountGetConnectivityConfiguration(t *testing.T) {
 	actual, err := client.TeamsAccountConnectivityConfiguration(context.Background(), testAccountID)
 
 	if assert.NoError(t, err) {
-		assert.Equal(t, actual, TeamsAccountConnectivitySettings{
+		assert.Equal(t, actual, TeamsConnectivitySettings{
 			ICMPProxyEnabled:   BoolPtr(false),
 			OfframpWarpEnabled: BoolPtr(false),
 		})
@@ -385,13 +385,13 @@ func TestTeamsAccountUpdateConnectivityConfiguration(t *testing.T) {
 
 	mux.HandleFunc("/accounts/"+testAccountID+"/zerotrust/connectivity_settings", handler)
 
-	actual, err := client.TeamsAccountConnectivityUpdateConfiguration(context.Background(), testAccountID, TeamsAccountConnectivitySettings{
+	actual, err := client.TeamsAccountConnectivityUpdateConfiguration(context.Background(), testAccountID, TeamsConnectivitySettings{
 		ICMPProxyEnabled:   BoolPtr(true),
 		OfframpWarpEnabled: BoolPtr(true),
 	})
 
 	if assert.NoError(t, err) {
-		assert.Equal(t, actual, TeamsAccountConnectivitySettings{
+		assert.Equal(t, actual, TeamsConnectivitySettings{
 			ICMPProxyEnabled:   BoolPtr(true),
 			OfframpWarpEnabled: BoolPtr(true),
 		})