Skip to content

Fix show webhooks. #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabriel-samfira merged 1 commit into from
Jun 19, 2025
Merged

Fix show webhooks. #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion runner/pool/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,16 @@ func validateHookRequest(controllerID, baseURL string, allHooks []*github.Hook,

func hookToParamsHookInfo(hook *github.Hook) params.HookInfo {
var insecureSSL bool
var hookURL string
config := hook.GetConfig()
if config != nil {
insecureSSL = config.GetInsecureSSL() == "1"
hookURL = config.GetURL()
}

return params.HookInfo{
ID: *hook.ID,
URL: hook.GetURL(),
URL: hookURL,
Events: hook.Events,
Active: *hook.Active,
InsecureSSL: insecureSSL,
Expand Down
36 changes: 18 additions & 18 deletions test/integration/organizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (suite *GarmSuite) CreateOrg(orgName, credentialsName, orgWebhookSecret str
WebhookSecret: orgWebhookSecret,
}
org, err := createOrg(suite.cli, suite.authToken, orgParams)
suite.NoError(err, "error creating organization")
suite.Require().NoError(err, "error creating organization")
return org
}

Expand All @@ -68,7 +68,7 @@ func (suite *GarmSuite) UpdateOrg(id, credentialsName string) *params.Organizati
CredentialsName: credentialsName,
}
org, err := updateOrg(suite.cli, suite.authToken, id, updateParams)
suite.NoError(err, "error updating organization")
suite.Require().NoError(err, "error updating organization")
return org
}

Expand All @@ -79,15 +79,15 @@ func (suite *GarmSuite) InstallOrgWebhook(id string) *params.HookInfo {
WebhookEndpointType: params.WebhookEndpointDirect,
}
_, err := installOrgWebhook(suite.cli, suite.authToken, id, webhookParams)
suite.NoError(err, "error installing organization webhook")
suite.Require().NoError(err, "error installing organization webhook")
webhookInfo, err := getOrgWebhook(suite.cli, suite.authToken, id)
suite.NoError(err, "error getting organization webhook")
suite.Require().NoError(err, "error getting organization webhook")
return webhookInfo
}

func (suite *GarmSuite) ValidateOrgWebhookInstalled(ghToken, url, orgName string) {
hook, err := getGhOrgWebhook(url, ghToken, orgName)
suite.NoError(err, "error getting github webhook")
suite.Require().NoError(err, "error getting github webhook")
suite.NotNil(hook, "github webhook with url %s, for org %s was not properly installed", url, orgName)
}

Expand All @@ -99,7 +99,7 @@ func getGhOrgWebhook(url, ghToken, orgName string) (*github.Hook, error) {
}

for _, hook := range ghOrgHooks {
hookURL := hook.GetURL()
hookURL := hook.Config.GetURL()
if hookURL == url {
return hook, nil
}
Expand All @@ -112,36 +112,36 @@ func (suite *GarmSuite) UninstallOrgWebhook(id string) {
t := suite.T()
t.Logf("Uninstall org webhook with org_id %s", id)
err := uninstallOrgWebhook(suite.cli, suite.authToken, id)
suite.NoError(err, "error uninstalling organization webhook")
suite.Require().NoError(err, "error uninstalling organization webhook")
}

func (suite *GarmSuite) ValidateOrgWebhookUninstalled(ghToken, url, orgName string) {
hook, err := getGhOrgWebhook(url, ghToken, orgName)
suite.NoError(err, "error getting github webhook")
suite.Require().NoError(err, "error getting github webhook")
suite.Nil(hook, "github webhook with url %s, for org %s was not properly uninstalled", url, orgName)
}

func (suite *GarmSuite) CreateOrgPool(orgID string, poolParams params.CreatePoolParams) *params.Pool {
t := suite.T()
t.Logf("Create org pool with org_id %s", orgID)
pool, err := createOrgPool(suite.cli, suite.authToken, orgID, poolParams)
suite.NoError(err, "error creating organization pool")
suite.Require().NoError(err, "error creating organization pool")
return pool
}

func (suite *GarmSuite) GetOrgPool(orgID, orgPoolID string) *params.Pool {
t := suite.T()
t.Logf("Get org pool with org_id %s and pool_id %s", orgID, orgPoolID)
pool, err := getOrgPool(suite.cli, suite.authToken, orgID, orgPoolID)
suite.NoError(err, "error getting organization pool")
suite.Require().NoError(err, "error getting organization pool")
return pool
}

func (suite *GarmSuite) DeleteOrgPool(orgID, orgPoolID string) {
t := suite.T()
t.Logf("Delete org pool with org_id %s and pool_id %s", orgID, orgPoolID)
err := deleteOrgPool(suite.cli, suite.authToken, orgID, orgPoolID)
suite.NoError(err, "error deleting organization pool")
suite.Require().NoError(err, "error deleting organization pool")
}

func (suite *GarmSuite) UpdateOrgPool(orgID, orgPoolID string, maxRunners, minIdleRunners uint) *params.Pool {
Expand All @@ -152,14 +152,14 @@ func (suite *GarmSuite) UpdateOrgPool(orgID, orgPoolID string, maxRunners, minId
MaxRunners: &maxRunners,
}
pool, err := updateOrgPool(suite.cli, suite.authToken, orgID, orgPoolID, poolParams)
suite.NoError(err, "error updating organization pool")
suite.Require().NoError(err, "error updating organization pool")
return pool
}

func (suite *GarmSuite) WaitOrgRunningIdleInstances(orgID string, timeout time.Duration) {
t := suite.T()
orgPools, err := listOrgPools(suite.cli, suite.authToken, orgID)
suite.NoError(err, "error listing organization pools")
suite.Require().NoError(err, "error listing organization pools")
for _, pool := range orgPools {
err := suite.WaitPoolInstances(pool.ID, commonParams.InstanceRunning, params.RunnerIdle, timeout)
if err != nil {
Expand All @@ -174,19 +174,19 @@ func (suite *GarmSuite) dumpOrgInstancesDetails(orgID string) {
// print org details
t.Logf("Dumping org details with org_id %s", orgID)
org, err := getOrg(suite.cli, suite.authToken, orgID)
suite.NoError(err, "error getting organization")
suite.Require().NoError(err, "error getting organization")
err = printJSONResponse(org)
suite.NoError(err, "error printing organization")
suite.Require().NoError(err, "error printing organization")

// print org instances details
t.Logf("Dumping org instances details for org %s", orgID)
instances, err := listOrgInstances(suite.cli, suite.authToken, orgID)
suite.NoError(err, "error listing organization instances")
suite.Require().NoError(err, "error listing organization instances")
for _, instance := range instances {
instance, err := getInstance(suite.cli, suite.authToken, instance.Name)
suite.NoError(err, "error getting instance")
suite.Require().NoError(err, "error getting instance")
t.Logf("Instance info for instace %s", instance.Name)
err = printJSONResponse(instance)
suite.NoError(err, "error printing instance")
suite.Require().NoError(err, "error printing instance")
}
}
34 changes: 17 additions & 17 deletions test/integration/repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (suite *GarmSuite) TestRepositories() {
CredentialsName: fmt.Sprintf("%s-clone", suite.credentialsName),
}
repo, err := updateRepo(suite.cli, suite.authToken, suite.repo.ID, updateParams)
suite.NoError(err, "error updating repository")
suite.Require().NoError(err, "error updating repository")
suite.Equal(fmt.Sprintf("%s-clone", suite.credentialsName), repo.CredentialsName, "credentials name mismatch")
suite.repo = repo

Expand Down Expand Up @@ -88,16 +88,16 @@ func (suite *GarmSuite) InstallRepoWebhook(id string) *params.HookInfo {
WebhookEndpointType: params.WebhookEndpointDirect,
}
_, err := installRepoWebhook(suite.cli, suite.authToken, id, webhookParams)
suite.NoError(err, "error installing repository webhook")
suite.Require().NoError(err, "error installing repository webhook")

webhookInfo, err := getRepoWebhook(suite.cli, suite.authToken, id)
suite.NoError(err, "error getting repository webhook")
suite.Require().NoError(err, "error getting repository webhook")
return webhookInfo
}

func (suite *GarmSuite) ValidateRepoWebhookInstalled(ghToken, url, orgName, repoName string) {
hook, err := getGhRepoWebhook(url, ghToken, orgName, repoName)
suite.NoError(err, "error getting github webhook")
suite.Require().NoError(err, "error getting github webhook")
suite.NotNil(hook, "github webhook with url %s, for repo %s/%s was not properly installed", url, orgName, repoName)
}

Expand All @@ -109,7 +109,7 @@ func getGhRepoWebhook(url, ghToken, orgName, repoName string) (*github.Hook, err
}

for _, hook := range ghRepoHooks {
hookURL := hook.GetURL()
hookURL := hook.Config.GetURL()
if hookURL == url {
return hook, nil
}
Expand All @@ -128,36 +128,36 @@ func (suite *GarmSuite) UninstallRepoWebhook(id string) {
t := suite.T()
t.Logf("Uninstall repo webhook with repo_id %s", id)
err := uninstallRepoWebhook(suite.cli, suite.authToken, id)
suite.NoError(err, "error uninstalling repository webhook")
suite.Require().NoError(err, "error uninstalling repository webhook")
}

func (suite *GarmSuite) ValidateRepoWebhookUninstalled(ghToken, url, orgName, repoName string) {
hook, err := getGhRepoWebhook(url, ghToken, orgName, repoName)
suite.NoError(err, "error getting github webhook")
suite.Require().NoError(err, "error getting github webhook")
suite.Nil(hook, "github webhook with url %s, for repo %s/%s was not properly uninstalled", url, orgName, repoName)
}

func (suite *GarmSuite) CreateRepoPool(repoID string, poolParams params.CreatePoolParams) *params.Pool {
t := suite.T()
t.Logf("Create repo pool with repo_id %s and pool_params %+v", repoID, poolParams)
pool, err := createRepoPool(suite.cli, suite.authToken, repoID, poolParams)
suite.NoError(err, "error creating repository pool")
suite.Require().NoError(err, "error creating repository pool")
return pool
}

func (suite *GarmSuite) GetRepoPool(repoID, repoPoolID string) *params.Pool {
t := suite.T()
t.Logf("Get repo pool repo_id %s and pool_id %s", repoID, repoPoolID)
pool, err := getRepoPool(suite.cli, suite.authToken, repoID, repoPoolID)
suite.NoError(err, "error getting repository pool")
suite.Require().NoError(err, "error getting repository pool")
return pool
}

func (suite *GarmSuite) DeleteRepoPool(repoID, repoPoolID string) {
t := suite.T()
t.Logf("Delete repo pool with repo_id %s and pool_id %s", repoID, repoPoolID)
err := deleteRepoPool(suite.cli, suite.authToken, repoID, repoPoolID)
suite.NoError(err, "error deleting repository pool")
suite.Require().NoError(err, "error deleting repository pool")
}

func (suite *GarmSuite) UpdateRepoPool(repoID, repoPoolID string, maxRunners, minIdleRunners uint) *params.Pool {
Expand All @@ -168,14 +168,14 @@ func (suite *GarmSuite) UpdateRepoPool(repoID, repoPoolID string, maxRunners, mi
MaxRunners: &maxRunners,
}
pool, err := updateRepoPool(suite.cli, suite.authToken, repoID, repoPoolID, poolParams)
suite.NoError(err, "error updating repository pool")
suite.Require().NoError(err, "error updating repository pool")
return pool
}

func (suite *GarmSuite) WaitRepoRunningIdleInstances(repoID string, timeout time.Duration) {
t := suite.T()
repoPools, err := listRepoPools(suite.cli, suite.authToken, repoID)
suite.NoError(err, "error listing repo pools")
suite.Require().NoError(err, "error listing repo pools")
for _, pool := range repoPools {
err := suite.WaitPoolInstances(pool.ID, commonParams.InstanceRunning, params.RunnerIdle, timeout)
if err != nil {
Expand All @@ -190,19 +190,19 @@ func (suite *GarmSuite) dumpRepoInstancesDetails(repoID string) {
// print repo details
t.Logf("Dumping repo details for repo %s", repoID)
repo, err := getRepo(suite.cli, suite.authToken, repoID)
suite.NoError(err, "error getting repo")
suite.Require().NoError(err, "error getting repo")
err = printJSONResponse(repo)
suite.NoError(err, "error printing repo")
suite.Require().NoError(err, "error printing repo")

// print repo instances details
t.Logf("Dumping repo instances details for repo %s", repoID)
instances, err := listRepoInstances(suite.cli, suite.authToken, repoID)
suite.NoError(err, "error listing repo instances")
suite.Require().NoError(err, "error listing repo instances")
for _, instance := range instances {
instance, err := getInstance(suite.cli, suite.authToken, instance.Name)
suite.NoError(err, "error getting instance")
suite.Require().NoError(err, "error getting instance")
t.Logf("Instance info for instance %s", instance.Name)
err = printJSONResponse(instance)
suite.NoError(err, "error printing instance")
suite.Require().NoError(err, "error printing instance")
}
}
Loading