Skip to content

Commit 8dd30a8

Browse files
committed
go fmt
1 parent 32df55b commit 8dd30a8

File tree

6 files changed

+29
-32
lines changed

6 files changed

+29
-32
lines changed

azure-devops-client/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type AzureDevopsClient struct {
2929
LimitReleasesPerDefinition int64
3030
LimitDeploymentPerDefinition int64
3131
LimitReleaseDefinitionsPerProject int64
32-
LimitReleasesPerProject int64
32+
LimitReleasesPerProject int64
3333
}
3434

3535
func NewAzureDevopsClient() *AzureDevopsClient {

azure-devops-client/release.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@ type ReleaseList struct {
1313
}
1414

1515
type Release struct {
16-
Id int64 `json:"id"`
16+
Id int64 `json:"id"`
1717
Name string `json:"name"`
1818

1919
Definition struct {
20-
Id int64 `json:"id"`
20+
Id int64 `json:"id"`
2121
Name string `json:"name"`
22-
Links Links `json:"_links"`
22+
Links Links `json:"_links"`
2323
} `json:"releaseDefinition"`
2424

2525
Project Project `json:"projectReference"`
2626

2727
Queue AgentPoolQueue `json:"queue"`
2828

29-
Reason string `json:"reason"`
30-
Result bool `json:"result"`
31-
Status string `json:"status"`
29+
Reason string `json:"reason"`
30+
Result bool `json:"result"`
31+
Status string `json:"status"`
3232
CreatedOn time.Time `json:"createdOn"`
3333
QueueTime time.Time `json:"queueTime"`
34-
QueuePosition string `json:"queuePosition"`
34+
QueuePosition string `json:"queuePosition"`
3535
StartTime time.Time `json:"startTime"`
3636
FinishTime time.Time `json:"finishTime"`
37-
Uri string `json:"uri"`
38-
Url string `json:"url"`
37+
Uri string `json:"uri"`
38+
Url string `json:"url"`
3939

40-
Artifacts []ReleaseArtifact `json:"artifacts"`
40+
Artifacts []ReleaseArtifact `json:"artifacts"`
4141
Environments []ReleaseEnvironment `json:"environments"`
4242

4343
RequestedBy IdentifyRef `json:"requestedBy"`
@@ -80,12 +80,12 @@ type ReleaseArtifact struct {
8080
}
8181

8282
type ReleaseEnvironment struct {
83-
Id int64 `json:"id"`
84-
ReleaseId int64 `json:"releaseId"`
85-
DefinitionEnvironmentId int64 `json:"definitionEnvironmentId"`
83+
Id int64 `json:"id"`
84+
ReleaseId int64 `json:"releaseId"`
85+
DefinitionEnvironmentId int64 `json:"definitionEnvironmentId"`
8686
Name string `json:"name"`
8787
Status string `json:"status"`
88-
Rank int64 `json:"rank"`
88+
Rank int64 `json:"rank"`
8989

9090
TriggerReason string `json:"triggerReason"`
9191

azure-devops-client/release_definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type ReleaseDefinitionEnvironment struct {
3333
CurrentRelease struct {
3434
Id int64
3535
Url string
36-
} `json:"currentRelease"`
36+
} `json:"currentRelease"`
3737

3838
BadgeUrl string `json:"badgeUrl"`
3939
}

main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ var opts struct {
7070
RequestConcurrencyLimit int64 `long:"request.concurrency" env:"REQUEST_CONCURRENCY" description:"Number of concurrent requests against dev.azure.com" default:"10"`
7171
RequestRetries int `long:"request.retries" env:"REQUEST_RETRIES" description:"Number of retried requests against dev.azure.com" default:"3"`
7272

73-
LimitBuildsPerDefinition int64 `long:"limit.builds-per-definition" env:"LIMIT_BUILDS_PER_DEFINITION" description:"Limit builds per definition" default:"10"`
74-
LimitReleasesPerProject int64 `long:"limit.releases-per-project" env:"LIMIT_RELEASES_PER_PROJECT" description:"Limit releases per project" default:"100"`
75-
LimitReleasesPerDefinition int64 `long:"limit.releases-per-definition" env:"LIMIT_RELEASES_PER_DEFINITION" description:"Limit releases per definition" default:"100"`
76-
LimitDeploymentPerDefinition int64 `long:"limit.deployments-per-definition" env:"LIMIT_DEPLOYMENTS_PER_DEFINITION" description:"Limit deployments per definition" default:"100"`
77-
LimitReleaseDefinitionsPerProject int64 `long:"limit.releasedefinitions-per-project" env:"LIMIT_RELEASEDEFINITION_PER_PROJECT" description:"Limit builds per definition" default:"100"`
73+
LimitBuildsPerDefinition int64 `long:"limit.builds-per-definition" env:"LIMIT_BUILDS_PER_DEFINITION" description:"Limit builds per definition" default:"10"`
74+
LimitReleasesPerProject int64 `long:"limit.releases-per-project" env:"LIMIT_RELEASES_PER_PROJECT" description:"Limit releases per project" default:"100"`
75+
LimitReleasesPerDefinition int64 `long:"limit.releases-per-definition" env:"LIMIT_RELEASES_PER_DEFINITION" description:"Limit releases per definition" default:"100"`
76+
LimitDeploymentPerDefinition int64 `long:"limit.deployments-per-definition" env:"LIMIT_DEPLOYMENTS_PER_DEFINITION" description:"Limit deployments per definition" default:"100"`
77+
LimitReleaseDefinitionsPerProject int64 `long:"limit.releasedefinitions-per-project" env:"LIMIT_RELEASEDEFINITION_PER_PROJECT" description:"Limit builds per definition" default:"100"`
7878
LimitReleaseDuration time.Duration `long:"limit.release-duration" env:"LIMIT_RELEASE_DURATION" description:"Time (time.Duration) how long the exporter should look back for releases" default:"48h"`
7979
}
8080

metrics_release.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,9 @@ func (m *MetricsCollectorRelease) Collect(ctx context.Context, callback chan<- f
203203
}
204204
}
205205

206-
207-
208206
// --------------------------------------
209207
// Releases
210-
minTime := time.Now().Add(- time.Duration(opts.LimitReleaseDuration))
208+
minTime := time.Now().Add(-time.Duration(opts.LimitReleaseDuration))
211209

212210
releaseList, err := AzureDevopsClient.ListLatestReleases(project.Id, minTime)
213211
if err != nil {
@@ -264,7 +262,7 @@ func (m *MetricsCollectorRelease) Collect(ctx context.Context, callback chan<- f
264262
"releaseID": int64ToString(release.Id),
265263
"environmentID": int64ToString(environment.DefinitionEnvironmentId),
266264
"type": "jobDuration",
267-
}, environment.TimeToDeploy * 60)
265+
}, environment.TimeToDeploy*60)
268266

269267
for _, approval := range environment.PreDeployApprovals {
270268
// skip automated approvals

metrics_stats.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ type MetricsCollectorStats struct {
1414
agentPoolBuildWait *prometheus.SummaryVec
1515
agentPoolBuildDuration *prometheus.SummaryVec
1616

17-
projectBuildCount *prometheus.CounterVec
18-
projectBuildWait *prometheus.SummaryVec
19-
projectBuildDuration *prometheus.SummaryVec
17+
projectBuildCount *prometheus.CounterVec
18+
projectBuildWait *prometheus.SummaryVec
19+
projectBuildDuration *prometheus.SummaryVec
2020
projectReleaseDuration *prometheus.SummaryVec
2121
}
2222
}
@@ -122,7 +122,6 @@ func (m *MetricsCollectorStats) Setup(collector *CollectorProject) {
122122
},
123123
)
124124

125-
126125
prometheus.MustRegister(m.prometheus.agentPoolBuildCount)
127126
prometheus.MustRegister(m.prometheus.agentPoolBuildWait)
128127
prometheus.MustRegister(m.prometheus.agentPoolBuildDuration)
@@ -157,10 +156,10 @@ func (m *MetricsCollectorStats) CollectReleases(ctx context.Context, callback ch
157156

158157
if timeToDeploy > 0 {
159158
m.prometheus.projectReleaseDuration.With(prometheus.Labels{
160-
"projectID": release.Project.Id,
161-
"releaseDefinitionID": int64ToString(release.Definition.Id),
159+
"projectID": release.Project.Id,
160+
"releaseDefinitionID": int64ToString(release.Definition.Id),
162161
"definitionEnvironmentID": int64ToString(environment.DefinitionEnvironmentId),
163-
"status": environment.Status,
162+
"status": environment.Status,
164163
}).Observe(timeToDeploy)
165164
}
166165
}

0 commit comments

Comments
 (0)