Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Add tags to resource_type_scanner
Browse files Browse the repository at this point in the history
Only useful for detecting changes to the underlying resource

Resource type checks triggered because of resource checks do not respect
tags

[#136146663]

Signed-off-by: Chris Hendrix <chendrix@pivotal.io>
  • Loading branch information
joshzarrabi authored and Chris Hendrix committed Dec 17, 2016
1 parent a22c3b6 commit d2e72bc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type ResourceType struct {
Name string `yaml:"name" json:"name" mapstructure:"name"`
Type string `yaml:"type" json:"type" mapstructure:"type"`
Source Source `yaml:"source" json:"source" mapstructure:"source"`
Tags Tags `yaml:"tags,omitempty" json:"tags" mapstructure:"tags"`
}

type ResourceTypes []ResourceType
Expand Down
4 changes: 2 additions & 2 deletions radar/resource_type_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (scanner *resourceTypeScanner) resourceTypeScan(logger lager.Logger, resour
resource.EmptyMetadata{},
session,
resource.ResourceType(resourceType.Type),
[]string{},
resourceType.Tags,
scanner.db.TeamID(),
atc.ResourceTypes{},
worker.NoopImageFetchingDelegate{},
Expand All @@ -124,7 +124,7 @@ func (scanner *resourceTypeScanner) resourceTypeScan(logger lager.Logger, resour

defer res.Release(nil)

logger.Debug("checking")
logger.Debug("checking", lager.Data{"resource-type-name": resourceType.Name})

newVersions, err := res.Check(resourceType.Source, atc.Version(fromVersion))
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion radar/resource_type_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ var _ = Describe("ResourceTypeScanner", func() {
Name: "some-resource-type",
Type: "docker-image",
Source: atc.Source{"custom": "source"},
Tags: atc.Tags{"some-tag"},
},
},
})
Expand All @@ -68,6 +69,7 @@ var _ = Describe("ResourceTypeScanner", func() {
Name: "some-resource-type",
Type: "docker-image",
Source: atc.Source{"custom": "source"},
Tags: atc.Tags{"some-tag"},
},
}
fakeRadarDB.TeamIDReturns(teamID)
Expand Down Expand Up @@ -139,7 +141,7 @@ var _ = Describe("ResourceTypeScanner", func() {
Ephemeral: true,
}))
Expect(typ).To(Equal(resource.ResourceType("docker-image")))
Expect(tags).To(BeEmpty()) // This allows the check to run on any worker
Expect(tags).To(Equal(atc.Tags{"some-tag"}))
Expect(actualTeamID).To(Equal(teamID))
Expect(customTypes).To(Equal(atc.ResourceTypes{}))
Expect(delegate).To(Equal(worker.NoopImageFetchingDelegate{}))
Expand Down Expand Up @@ -219,6 +221,7 @@ var _ = Describe("ResourceTypeScanner", func() {
Name: "some-resource-type",
Type: "docker-image",
Source: atc.Source{"custom": "source"},
Tags: atc.Tags{"some-tag"},
}))

Expect(version).To(Equal(atc.Version{"version": "3"}))
Expand Down

0 comments on commit d2e72bc

Please sign in to comment.