revert subdomain feature

grid-cli/internal/cmd/deploy.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
@@ -110,10 +109,7 @@ func DeployGatewayName(ctx context.Context, t deployer.TFPluginClient, gateway w
 		return workloads.GatewayNameProxy{}, errors.Wrapf(err, "failed to deploy gateway on node %d", gateway.NodeID)
 	}
 
-	subdomains := strings.Split(gateway.Name, ".")
-	contractName := subdomains[len(subdomains)-1]
-
-	return t.State.LoadGatewayNameFromGrid(ctx, gateway.NodeID, contractName, strings.ReplaceAll(gateway.Name, ".", "_"))
+	return t.State.LoadGatewayNameFromGrid(ctx, gateway.NodeID, gateway.Name, gateway.Name)
 }
 
 // DeployGatewayFQDN deploys a gateway fqdn

grid-client/deployer/gateway_name_deployer.go

@@ -3,10 +3,8 @@ package deployer
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/pkg/errors"
-	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	client "github.com/threefoldtech/tfgrid-sdk-go/grid-client/node"
 	"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
 	"github.com/threefoldtech/zos/pkg/gridtypes"
@@ -73,26 +71,9 @@ func (d *GatewayNameDeployer) Deploy(ctx context.Context, gw *workloads.GatewayN
 	}
 
 	if gw.NameContractID == 0 {
-		createNameContract := true
-
-		subdomains := strings.Split(gw.Name, ".")
-		contractName := subdomains[len(subdomains)-1]
-
-		if len(subdomains) >= 2 { // if we have a given subdomain of the name (subdomain.name) check if the name exists
-			contractID, err := d.tfPluginClient.SubstrateConn.GetContractIDByNameRegistration(contractName)
-			if err != nil && err != substrate.ErrNotFound {
-				return err
-			}
-			if contractID > 0 {
-				createNameContract = false
-			}
-		}
-
-		if createNameContract {
-			gw.NameContractID, err = d.tfPluginClient.SubstrateConn.CreateNameContract(d.tfPluginClient.Identity, contractName)
-			if err != nil {
-				return err
-			}
+		gw.NameContractID, err = d.tfPluginClient.SubstrateConn.CreateNameContract(d.tfPluginClient.Identity, gw.Name)
+		if err != nil {
+			return err
 		}
 	}
 

grid-client/workloads/gateway_name.go

@@ -3,7 +3,6 @@ package workloads
 
 import (
 	"encoding/json"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/threefoldtech/zos/pkg/gridtypes"
@@ -76,7 +75,7 @@ func (g *GatewayNameProxy) ZosWorkload() gridtypes.Workload {
 	return gridtypes.Workload{
 		Version: 0,
 		Type:    zos.GatewayNameProxyType,
-		Name:    gridtypes.Name(strings.ReplaceAll(g.Name, ".", "_")),
+		Name:    gridtypes.Name(g.Name),
 		// REVISE: whether description should be set here
 		Data: gridtypes.MustMarshal(zos.GatewayNameProxy{
 			GatewayBase: zos.GatewayBase{
@@ -92,12 +91,12 @@ func (g *GatewayNameProxy) ZosWorkload() gridtypes.Workload {
 // GenerateMetadata generates gateway deployment metadata
 func (g *GatewayNameProxy) GenerateMetadata() (string, error) {
 	if len(g.SolutionType) == 0 {
-		g.SolutionType = strings.ReplaceAll(g.Name, ".", "_")
+		g.SolutionType = g.Name
 	}
 
 	deploymentData := DeploymentData{
 		Version:     Version,
-		Name:        strings.ReplaceAll(g.Name, ".", "_"),
+		Name:        g.Name,
 		Type:        "Gateway Name",
 		ProjectName: g.SolutionType,
 	}