Rename properties/variables to use URL and ID instead of "Url" and "Id"

Delete obsolete files left behind in rebase.
Fix linting issues.

Author: strangedreamsNY

modules/auth/repo_form.go

@@ -556,24 +556,24 @@ func TeamCityHooksNewPost(ctx *context.Context) {
 	}
 
 	meta, err := json.Marshal(&webhook_service.TeamCityMeta{
-		HostUrl:   form.HostUrl,
+		HostURL:   form.HostURL,
 		AuthToken: form.AuthToken,
-		VcsRootId: form.VcsRootId,
+		VcsRootID: form.VcsRootID,
 	})
 	if err != nil {
 		ctx.ServerError("Marshal", err)
 		return
 	}
 
-	payloadUrl, err := buildTeamCityUrl(form)
+	payloadURL, err := buildTeamCityURL(form)
 	if err != nil {
-		ctx.ServerError("buildTeamCityUrl", err)
+		ctx.ServerError("buildTeamCityURL", err)
 		return
 	}
 
 	w := &webhook.Webhook{
 		RepoID:          orCtx.RepoID,
-		URL:             payloadUrl,
+		URL:             payloadURL,
 		ContentType:     webhook.ContentTypeForm,
 		HookEvent:       ParseHookEvent(form.WebhookForm),
 		IsActive:        form.Active,
@@ -1210,19 +1210,18 @@ func TeamCityHooksEditPost(ctx *context.Context) {
 	}
 
 	meta, err := json.Marshal(&webhook_service.TeamCityMeta{
-		HostUrl:   form.HostUrl,
+		HostURL:   form.HostURL,
 		AuthToken: form.AuthToken,
-		VcsRootId: form.VcsRootId,
+		VcsRootID: form.VcsRootID,
 	})
-
 	if err != nil {
 		ctx.ServerError("Marshal", err)
 		return
 	}
 
-	w.URL, err = buildTeamCityUrl(form)
+	w.URL, err = buildTeamCityURL(form)
 	if err != nil {
-		ctx.ServerError("buildTeamCityUrl", err)
+		ctx.ServerError("buildTeamCityURL", err)
 		return
 	}
 
@@ -1243,13 +1242,14 @@ func TeamCityHooksEditPost(ctx *context.Context) {
 	ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID))
 }
 
-func buildTeamCityUrl(meta *forms.NewTeamCityHookForm) (string, error) {
-	tcUrl, err := url.Parse(meta.HostUrl)
+// buildTeamCityURL returns the correct REST API url for a TeamCity POST request.
+func buildTeamCityURL(meta *forms.NewTeamCityHookForm) (string, error) {
+	tcURL, err := url.Parse(meta.HostURL)
 	if err != nil {
 		return "", err
 	}
 
-	return fmt.Sprintf("%s/app/rest/vcs-root-instances/commitHookNotification?locator=vcsRoot:%s", tcUrl, meta.VcsRootId), nil
+	return fmt.Sprintf("%s/app/rest/vcs-root-instances/commitHookNotification?locator=vcsRoot:%s", tcURL, meta.VcsRootID), nil
 }
 
 // FeishuHooksEditPost response for editing feishu hook

modules/webhook/deliver.go

@@ -373,9 +373,9 @@ func (f *NewMSTeamsHookForm) Validate(req *http.Request, errs binding.Errors) bi
 }
 
 type NewTeamCityHookForm struct {
-	HostUrl   string `binding:"Required;ValidUrl"`
+	HostURL   string `binding:"Required;ValidUrl"`
 	AuthToken string `binding:"Required"`
-	VcsRootId string `binding:"Required"`
+	VcsRootID string `binding:"Required"`
 	WebhookForm
 }
 

modules/webhook/webhook.go

@@ -5,19 +5,18 @@
 package webhook
 
 import (
-	"encoding/json"
-
 	webhook_model "code.gitea.io/gitea/models/webhook"
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 )
 
 type (
 	// TeamCityMeta contains metadata for the TeamCity WebHook
 	TeamCityMeta struct {
-		HostUrl   string `json:"host_url"`
+		HostURL   string `json:"host_url"`
 		AuthToken string `json:"auth_token"`
-		VcsRootId string `json:"vcs_root_id"`
+		VcsRootID string `json:"vcs_root_id"`
 	}
 )
 

routers/repo/webhook.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.package webhook
+
 package webhook
 
 import (
@@ -27,9 +31,9 @@ func TestWebhook_GetTeamCityHook(t *testing.T) {
 
 		teamcityHook := GetTeamCityHook(w)
 		assert.Equal(t, *teamcityHook, TeamCityMeta{
-			HostUrl:   "http://localhost.com",
+			HostURL:   "http://localhost.com",
 			AuthToken: "testToken",
-			VcsRootId: "fooVCS",
+			VcsRootID: "fooVCS",
 		})
 	})
 }