Commit 6bf0c841 authored by Ayesha Ayub's avatar Ayesha Ayub
Browse files

Merge branch 'STF678_Task1_2' of https://forge.etsi.org/rep/mec/AdvantEDGE into STF678_Task1_2

parents 1e79c5cd 45a7fe2b

.meepctl-repocfg.yaml

+5 −1
Original line number Diff line number Diff line
@@ -67,7 +67,11 @@ repo: 
      # GitHub OAuth provider config

      github:

        # enable GitHub OAuth

        enabled: false

        enabled: true

        # device authorization url

        device-auth-url: https://github.com/login/device/code

        # device polling url

        device-poll-url: https://github.com/login/oauth/access_token

        # authorization url

        auth-url: https://github.com/login/oauth/authorize

        # access token url

go-apps/meepctl/cmd/deploy.go

+2 −2
Original line number Diff line number Diff line
@@ -501,9 +501,9 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr 
		}

		githubEnabled := utils.RepoCfg.GetBool("repo.deployment.auth.github.enabled")

		if githubEnabled {

			authUrl := utils.RepoCfg.GetString("repo.deployment.auth.github.auth-url")

			authUrl := utils.RepoCfg.GetString("repo.deployment.auth.github.device-auth-url")

			secret := utils.RepoCfg.GetString("repo.deployment.auth.github.secret")

			pollUrl := utils.RepoCfg.GetString("repo.deployment.auth.github.poll-url")

			pollUrl := utils.RepoCfg.GetString("repo.deployment.auth.github.device-poll-url")

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_ENABLED=true")

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_AUTH_URL="+authUrl)

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_POLL_URL="+pollUrl)