1
0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00

Removed old code and minor changes

This commit is contained in:
Juan Font Alonso 2022-09-08 18:11:41 +02:00
parent fca380587a
commit 5f384c6323

View File

@ -25,6 +25,7 @@ import (
) )
const ( const (
oidcHeadscaleHostname = "headscale"
oidcNamespaceName = "oidcnamespace" oidcNamespaceName = "oidcnamespace"
totalOidcContainers = 3 totalOidcContainers = 3
) )
@ -143,7 +144,7 @@ oidc:
err = os.WriteFile(configPath, []byte(config), 0644) err = os.WriteFile(configPath, []byte(config), 0644)
headscaleOptions := &dockertest.RunOptions{ headscaleOptions := &dockertest.RunOptions{
Name: "headscale", Name: oidcHeadscaleHostname,
Mounts: []string{ Mounts: []string{
fmt.Sprintf( fmt.Sprintf(
"%s/integration_test/etc_oidc:/etc/headscale", "%s/integration_test/etc_oidc:/etc/headscale",
@ -158,7 +159,7 @@ oidc:
}, },
} }
err = s.pool.RemoveContainerByName("headscale") err = s.pool.RemoveContainerByName(oidcHeadscaleHostname)
if err != nil { if err != nil {
s.FailNow( s.FailNow(
fmt.Sprintf( fmt.Sprintf(
@ -225,30 +226,6 @@ oidc:
log.Println("headscale create namespace result: ", result) log.Println("headscale create namespace result: ", result)
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
// log.Printf("Creating pre auth key for %s\n", oidcNamespaceName)
// preAuthResult, err := ExecuteCommand(
// &s.headscale,
// []string{
// "headscale",
// "--namespace",
// oidcNamespaceName,
// "preauthkeys",
// "create",
// "--reusable",
// "--expiration",
// "24h",
// "--output",
// "json",
// },
// []string{"LOG_LEVEL=error"},
// )
// assert.Nil(s.T(), err)
// var preAuthKey v1.PreAuthKey
// err = json.Unmarshal([]byte(preAuthResult), &preAuthKey)
// assert.Nil(s.T(), err)
// assert.True(s.T(), preAuthKey.Reusable)
headscaleEndpoint := fmt.Sprintf( headscaleEndpoint := fmt.Sprintf(
"https://headscale:%s", "https://headscale:%s",
s.headscale.GetPort("8443/tcp"), s.headscale.GetPort("8443/tcp"),