Skip to content

chore(testing): Add tests for Domain Reconciler #646

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
jonstacks merged 4 commits into from
May 6, 2025
Merged

chore(testing): Add tests for Domain Reconciler #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fe1dac
chore(mocks): Generate mocks with consistent prefix for .gitattributes
jonstacks May 2, 2025
3b46a3c
feat(testing): Create a mock domain client
jonstacks May 5, 2025
6d7d9b2
feat(testing): Add tests for domain controller
jonstacks May 5, 2025
e8ac626
chore(domain-controller): Use k8s ptr library for comparison of CNAME…
jonstacks May 5, 2025
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: 1 addition & 3 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ manifest-bundle.yaml linguist-generated=true
helm/ngrok-operator/values.schema.json linguist-generated=true

# Generated by mockgen
internal/mocks/conn.go linguist-generated=true
internal/mocks/dialer.go linguist-generated=true
internal/mocks/tunnel.go linguist-generated=true
internal/mocks/mock_*.go linguist-generated=true
3 changes: 2 additions & 1 deletion api/ingress/v1alpha1/domain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

"github.com/ngrok/ngrok-api-go/v7"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
Expand Down Expand Up @@ -126,7 +127,7 @@
d.Status.Region == ngrokDomain.Region &&
d.Status.Domain == ngrokDomain.Domain &&
d.Status.URI == ngrokDomain.URI &&
d.Status.CNAMETarget == ngrokDomain.CNAMETarget &&
ptr.Equal(d.Status.CNAMETarget, ngrokDomain.CNAMETarget) &&

Check warning on line 130 in api/ingress/v1alpha1/domain_types.go

View check run for this annotation

Codecov / codecov/patch

api/ingress/v1alpha1/domain_types.go#L130 

Added line #L130 was not covered by tests
d.Spec.Description == ngrokDomain.Description &&
d.Spec.Metadata == ngrokDomain.Metadata
}
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
github.com/ngrok/ngrok-api-go/v7 v7.3.0
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.36.3
github.com/segmentio/ksuid v1.0.4
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
go.uber.org/mock v0.5.2
Expand Down Expand Up @@ -112,6 +113,7 @@ require (
)

tool (
github.com/onsi/ginkgo/v2/ginkgo
go.uber.org/mock/mockgen
sigs.k8s.io/controller-runtime/tools/setup-envtest
sigs.k8s.io/controller-tools/cmd/controller-gen
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do=
github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down
Loading
Loading