Skip to content

Commit

Permalink
Linting.
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentluce committed Dec 6, 2023
1 parent 508bae7 commit eaf423e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ package backend_creator
import (
"context"
"fmt"
"net"
"os"
"path"

"github.com/docker/docker/client"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions"
Expand All @@ -19,9 +23,6 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/database_accessors/enclave_db/service_registration"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"net"
"os"
"path"
)

const (
Expand Down Expand Up @@ -253,7 +254,7 @@ func getDockerKurtosisBackend(
network.GetGatewayIp(): true,
apiContainerIp.String(): true,
logsCollectorObj.GetEnclaveNetworkIpAddress().String(): true,
reverseProxyEnclaveNetworkIpAddress.String(): true,
reverseProxyEnclaveNetworkIpAddress.String(): true,
}

freeIpAddrProvider, err := free_ip_addr_tracker.GetOrCreateNewFreeIpAddrTracker(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ func (backend *DockerKurtosisBackend) DestroyLogsCollectorForEnclave(ctx context
}

func (backend *DockerKurtosisBackend) CreateReverseProxy(ctx context.Context) (*reverse_proxy.ReverseProxy, error) {
reverseProxyContainer := traefik.NewTraefikReverseProxyContainer() //Declaring the implementation
reverseProxyContainer := traefik.NewTraefikReverseProxyContainer()

reverseProxy, _, err := reverse_proxy_functions.CreateReverseProxy(
ctx,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package engine_functions

import (
"context"

"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_aggregator_functions"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/reverse_proxy_functions"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_manager"
Expand Down Expand Up @@ -72,7 +73,7 @@ func StopEngines(
if err := logs_aggregator_functions.DestroyLogsAggregator(ctx, dockerManager); err != nil {
return nil, nil, stacktrace.Propagate(err, "An error occurred removing the logging components.")
}

// Stop reverse proxy
if err := reverse_proxy_functions.DestroyReverseProxy(ctx, dockerManager); err != nil {
return nil, nil, stacktrace.Propagate(err, "An error occurred removing the reverse proxy.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ func ConnectReverseProxyToEnclaveNetworks(ctx context.Context, dockerManager *do
return stacktrace.Propagate(err, "An error occurred connecting the reverse proxy to the enclave network with id '%v'", enclaveNetwork.GetId())
}
}

return nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ func (manager *DockerManager) GetContainerIps(ctx context.Context, containerId s
}
allNetworkInfo := resp.NetworkSettings.Networks
for _, networkInfo := range allNetworkInfo {
containerIps[networkInfo.NetworkID]= networkInfo.IPAddress
containerIps[networkInfo.NetworkID] = networkInfo.IPAddress
}
return containerIps, nil
}
Expand Down

0 comments on commit eaf423e

Please sign in to comment.