diff --git a/contrib/providers.d/azure/garm-external-provider b/contrib/providers.d/azure/garm-external-provider index 29ac76e2..b0cf18d8 100755 --- a/contrib/providers.d/azure/garm-external-provider +++ b/contrib/providers.d/azure/garm-external-provider @@ -75,7 +75,6 @@ function downloadURL() { } function tempDownloadToken() { - # temp_download_token [ -z "$1" -o -z "$2" ] && return 1 GH_ARCH="${GARM_TO_GH_ARCH_MAP[$2]}" TOKEN=$(echo "$INPUT" | jq -c -r --arg OS "$1" --arg ARCH "$GH_ARCH" '(.tools[] | select( .os == $OS and .architecture == $ARCH)).temp_download_token') @@ -127,7 +126,7 @@ function repoURL() { echo "${REPO}" } -function getRegistrationTokenFromAPI() { +function ghAccessToken() { TOKEN_URL=$(runnerTokenURL) BEARER_TOKEN=$(callbackToken) TOKEN=$(curl --fail -s -X GET -H 'Accept: application/json' -H "Authorization: Bearer ${BEARER_TOKEN}" "${TOKEN_URL}") @@ -135,15 +134,6 @@ function getRegistrationTokenFromAPI() { echo "${TOKEN}" } -function ghAccessToken() { - TOKEN=$(echo "$INPUT" | jq -c -r '.github_runner_access_token') - if [ -z "$TOKEN" ];then - TOKEN=$(getRegistrationTokenFromAPI) - fi - checkValNotNull "${TOKEN}" "github_runner_access_token" || return $? - echo "${TOKEN}" -} - function callbackURL() { CB_URL=$(echo "$INPUT" | jq -c -r '."callback-url"') checkValNotNull "${CB_URL}" "callback-url" || return $? diff --git a/contrib/providers.d/openstack/garm-external-provider b/contrib/providers.d/openstack/garm-external-provider index fb001e9a..93c0a64b 100755 --- a/contrib/providers.d/openstack/garm-external-provider +++ b/contrib/providers.d/openstack/garm-external-provider @@ -146,7 +146,6 @@ function downloadURL() { } function tempDownloadToken() { - # temp_download_token [ -z "$1" -o -z "$2" ] && return 1 GH_ARCH="${GARM_TO_GH_ARCH_MAP[$2]}" TOKEN=$(echo "$INPUT" | jq -c -r --arg OS "$1" --arg ARCH "$GH_ARCH" '(.tools[] | select( .os == $OS and .architecture == $ARCH)).temp_download_token') diff --git a/params/requests.go b/params/requests.go index 4393284a..cda5c387 100644 --- a/params/requests.go +++ b/params/requests.go @@ -107,15 +107,14 @@ type UpdatePoolParams struct { } type CreateInstanceParams struct { - Name string - OSType config.OSType - OSArch config.OSArch - Status common.InstanceStatus - RunnerStatus common.RunnerStatus - CallbackURL string - MetadataURL string - CreateAttempt int `json:"-"` - GithubRegistrationToken []byte `json:"-"` + Name string + OSType config.OSType + OSArch config.OSArch + Status common.InstanceStatus + RunnerStatus common.RunnerStatus + CallbackURL string + MetadataURL string + CreateAttempt int `json:"-"` } type CreatePoolParams struct { diff --git a/runner/pool/pool.go b/runner/pool/pool.go index 9ea4a8aa..97755024 100644 --- a/runner/pool/pool.go +++ b/runner/pool/pool.go @@ -345,25 +345,16 @@ func (r *basePoolManager) AddRunner(ctx context.Context, poolID string) error { } name := fmt.Sprintf("garm-%s", uuid.New()) - tk, err := r.helper.GetGithubRegistrationToken() - if err != nil { - if errors.Is(err, runnerErrors.ErrUnauthorized) { - failureReason := fmt.Sprintf("failed to fetch registration token: %q", err) - r.setPoolRunningState(false, failureReason) - log.Print(failureReason) - } - return errors.Wrap(err, "fetching registration token") - } + createParams := params.CreateInstanceParams{ - Name: name, - Status: providerCommon.InstancePendingCreate, - RunnerStatus: providerCommon.RunnerPending, - OSArch: pool.OSArch, - OSType: pool.OSType, - GithubRegistrationToken: []byte(tk), - CallbackURL: r.helper.GetCallbackURL(), - MetadataURL: r.helper.GetMetadataURL(), - CreateAttempt: 1, + Name: name, + Status: providerCommon.InstancePendingCreate, + RunnerStatus: providerCommon.RunnerPending, + OSArch: pool.OSArch, + OSType: pool.OSType, + CallbackURL: r.helper.GetCallbackURL(), + MetadataURL: r.helper.GetMetadataURL(), + CreateAttempt: 1, } _, err = r.store.CreateInstance(r.ctx, poolID, createParams)