Skip to content

Commit

Permalink
Revert "access tier group terraform changes (#157)" (#166)
Browse files Browse the repository at this point in the history
This reverts commit aedea9e.
  • Loading branch information
nareshkakubal authored Apr 4, 2024
1 parent aedea9e commit ee33ead
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 801 deletions.
2 changes: 0 additions & 2 deletions banyan/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ func Provider() *schema.Provider {
"banyan_api_key": resourceApiKey(),
"banyan_connector": resourceConnector(),
"banyan_accesstier": resourceAccessTier(),

"banyan_accesstier_group": resourceAccessTierGroup(),
},
DataSourcesMap: map[string]*schema.Resource{
"banyan_oidc_settings": dataSourceOidcSettings(),
Expand Down
268 changes: 0 additions & 268 deletions banyan/resource_accesstier_group.go

This file was deleted.

46 changes: 0 additions & 46 deletions banyan/resource_accesstier_group_test.go

This file was deleted.

27 changes: 4 additions & 23 deletions banyan/resource_service_tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ func TunnelSchema() (s map[string]*schema.Schema) {
Type: schema.TypeString,
},
},
"access_tier_group": {
Type: schema.TypeString,
Optional: true,
Description: "Name of the access_tier group which the service tunnel should be associated with",
},
}
return
}
Expand Down Expand Up @@ -293,22 +288,14 @@ func expandServiceTunnelSpec(d *schema.ResourceData) (expanded servicetunnel.Spe
exclApplications := convertSchemaSetToStringSlice(d.Get("applications_exclude").(*schema.Set))

var peers []servicetunnel.PeerAccessTier
accessTierGroup := d.Get("access_tier_group").(string)
// if access_tiers not set and access tier group is empty => global-edge, use ["*"]

// if access_tiers not set => global-edge, use ["*"]
if len(ats) == 0 {
peer := servicetunnel.PeerAccessTier{
peers = append(peers, servicetunnel.PeerAccessTier{
Cluster: d.Get("cluster").(string),
AccessTiers: []string{"*"},
Connectors: conns,
}

if accessTierGroup != "" {
peer.AccessTiers = nil
peer.Connectors = nil
peer.AccessTierGroup = accessTierGroup
}

peers = append(peers, peer)
})
} else {
// If multiple accessTiers are set create peer foreach.
for i, eachAts := range ats {
Expand Down Expand Up @@ -436,12 +423,6 @@ func flattenServiceTunnelSpec(d *schema.ResourceData, tun servicetunnel.ServiceT
}
}
}

err = d.Set("access_tier_group", eachPeer.AccessTierGroup)
if err != nil {
return err
}

}
err = d.Set("access_tiers", ats)
if err != nil {
Expand Down
Loading

0 comments on commit ee33ead

Please sign in to comment.