Merge pull request #344 from jumppad-labs/erik/undo-network

Undo default network work until a better implementation is made

Author: eveld

pkg/clients/container/docker_tasks.go

@@ -397,24 +397,6 @@ func (d *DockerTasks) CreateContainer(c *dtypes.Container) (string, error) {
 		}
 	}
 
-	if len(c.Networks) == 0 {
-		net, err := d.FindNetwork("resource.network.jumppad")
-		if err != nil {
-			return "", err
-		}
-
-		err = d.AttachNetwork(net.Name, cont.ID, []string{}, "")
-		if err != nil {
-			// if we fail to connect to the network roll back the container
-			errRemove := d.RemoveContainer(cont.ID, false)
-			if errRemove != nil {
-				return "", fmt.Errorf("failed to attach network %s to container %s, unable to roll back container: %w", "jumppad", cont.ID, err)
-			}
-
-			return "", fmt.Errorf("unable to connect container to network %s, successfully rolled back container: %w", "jumppad", err)
-		}
-	}
-
 	err = d.c.ContainerStart(context.Background(), cont.ID, container.StartOptions{})
 	if err != nil {
 		return "", err

pkg/clients/container/docker_tasks_container_create_test.go

@@ -115,7 +115,6 @@ func setupContainerMocks() (*mocks.Docker, *imocks.ImageLog) {
 		[]network.Summary{
 			{ID: "abc", Labels: map[string]string{"id": "network.testnet"}, IPAM: network.IPAM{Config: []network.IPAMConfig{{Subnet: "10.0.0.0/24"}}}},
 			{ID: "123", Labels: map[string]string{"id": "network.wan"}, IPAM: network.IPAM{Config: []network.IPAMConfig{{Subnet: "10.2.0.0/24"}}}},
-			{ID: "jumppad", Labels: map[string]string{"id": "resource.network.jumppad"}, IPAM: network.IPAM{Config: []network.IPAMConfig{{Subnet: "10.0.10.0/24"}}}},
 		}, nil)
 
 	md.On("VolumeList", mock.Anything, mock.Anything).Return(volume.ListResponse{}, nil)
@@ -269,14 +268,14 @@ func TestContainerRollsbackWhenUnableToConnectToNetwork(t *testing.T) {
 	md.AssertCalled(t, "ContainerRemove", mock.Anything, mock.Anything, mock.Anything)
 }
 
-func TestContainerOnlyAttachesToDefaultNetworkWhenNil(t *testing.T) {
+func TestContainerDoesNOTAttachesToUserNetworkWhenNil(t *testing.T) {
 	cc, md, mic := createContainerConfig()
 	cc.Networks = []dtypes.NetworkAttachment{}
 
 	err := setupContainer(t, cc, md, mic)
 	assert.NoError(t, err)
 
-	md.AssertNumberOfCalls(t, "NetworkConnect", 1)
+	md.AssertNumberOfCalls(t, "NetworkConnect", 0)
 }
 
 func TestContainerAssignsIPToUserNetwork(t *testing.T) {

pkg/clients/container/docker_tasks_copy_to_volume_test.go

@@ -89,22 +89,7 @@ func testSetupCopyLocal(t *testing.T) (*DockerTasks, *mocks.Docker) {
 		Return(volume.ListResponse{Volumes: []*volume.Volume{{}}})
 
 	mk.On("NetworkList", mock.Anything, mock.Anything).
-		Return([]network.Inspect{{
-			Name: "jumppad",
-			ID:   "resource.network.jumppad",
-			Labels: map[string]string{
-				"id": "resource.network.jumppad",
-			},
-			IPAM: network.IPAM{
-				Driver: "default",
-				Config: []network.IPAMConfig{
-					{
-						Subnet: "10.0.10.0/24",
-					},
-				},
-			},
-			EnableIPv6: false,
-		}}, nil)
+		Return([]network.Inspect{}, nil)
 
 	mk.On("NetworkConnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 

pkg/config/resources/network/resource.go

@@ -7,12 +7,6 @@ import (
 // TypeNetwork is the string resource type for Network resources
 const TypeNetwork string = "network"
 
-const (
-	DefaultNetworkID     string = "resource.network.jumppad"
-	DefaultNetworkName   string = "jumppad"
-	DefaultNetworkSubnet string = "10.0.10.0/24"
-)
-
 // Network defines a Docker network
 type Network struct {
 	// embedded type holding name, etc

pkg/jumppad/engine.go

@@ -17,7 +17,6 @@ import (
 	"github.com/jumppad-labs/jumppad/pkg/clients/logger"
 	"github.com/jumppad-labs/jumppad/pkg/config"
 	"github.com/jumppad-labs/jumppad/pkg/config/resources/cache"
-	"github.com/jumppad-labs/jumppad/pkg/config/resources/container"
 	"github.com/jumppad-labs/jumppad/pkg/config/resources/network"
 	"github.com/jumppad-labs/jumppad/pkg/jumppad/constants"
 	"github.com/jumppad-labs/jumppad/pkg/utils"
@@ -164,11 +163,6 @@ func (e *EngineImpl) Diff(path string, variables map[string]string, variablesFil
 			continue
 		}
 
-		// if this is the default network continue as this is always added
-		if r.Metadata().Type == network.TypeNetwork && r.Metadata().ID == network.DefaultNetworkID {
-			continue
-		}
-
 		found := false
 		for _, r2 := range res.Resources {
 			if r.Metadata().ID == r2.Metadata().ID {
@@ -245,49 +239,6 @@ func (e *EngineImpl) ApplyWithVariables(ctx context.Context, path string, vars m
 
 	e.config = c
 
-	// check if there are any networks defined by the user
-	_, err = c.FindResourcesByType(network.TypeNetwork)
-	if err != nil {
-		// create a new network
-		n := &network.Network{
-			ResourceBase: types.ResourceBase{
-				Meta: types.Meta{
-					ID:         network.DefaultNetworkID,
-					Name:       network.DefaultNetworkName,
-					Type:       network.TypeNetwork,
-					Properties: map[string]interface{}{},
-				},
-			},
-			Subnet: network.DefaultNetworkSubnet,
-		}
-
-		e.log.Debug("Creating default Network", "id", n.Meta.ID)
-
-		p := e.providers.GetProvider(n)
-		if p == nil {
-			// this should never happen
-			panic("Unable to find provider for Network, Nic assured me that you should never see this message. Sorry, the monkey has broken something again")
-		}
-
-		// create the network
-		err := p.Create(ctx)
-		if err != nil {
-			n.Meta.Properties[constants.PropertyStatus] = constants.StatusFailed
-		} else {
-			n.Meta.Properties[constants.PropertyStatus] = constants.StatusCreated
-		}
-
-		// add the new network to the config
-		e.config.AppendResource(n)
-
-		// save the state
-		config.SaveState(e.config)
-
-		if err != nil {
-			return nil, fmt.Errorf("unable to create network %s", err)
-		}
-	}
-
 	// check to see we already have an image cache
 	_, err = c.FindResourcesByType(cache.TypeImageCache)
 	if err != nil {
@@ -303,20 +254,6 @@ func (e *EngineImpl) ApplyWithVariables(ctx context.Context, path string, vars m
 			},
 		}
 
-		// if the default network was created,
-		// add the default network as a dependency
-		_, err = c.FindResource(network.DefaultNetworkID)
-		if err == nil {
-			ca.Networks = container.NetworkAttachments{
-				{
-					ID:   network.DefaultNetworkID,
-					Name: network.DefaultNetworkName,
-				},
-			}
-
-			ca.AddDependency(network.DefaultNetworkID)
-		}
-
 		e.log.Debug("Creating new Image Cache", "id", ca.Meta.ID)
 
 		p := e.providers.GetProvider(ca)