Skip to content

fixes #7592 - adding typed to mockgen#7647

Merged
lakshmimsft merged 6 commits into
radius-project:mainfrom
superbeeny:superbeeny/fixes7592
Jun 4, 2024
Merged

fixes #7592 - adding typed to mockgen#7647
lakshmimsft merged 6 commits into
radius-project:mainfrom
superbeeny:superbeeny/fixes7592

Conversation

@superbeeny
Copy link
Copy Markdown
Contributor

Description

Fixes issue #7592 - adding types to generated mocks

Type of change

Fixes: #7592

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
@superbeeny superbeeny requested review from a team as code owners May 30, 2024 18:32
…n dequeue test

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented May 30, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 42 lines in your changes missing coverage. Please review.

Project coverage is 61.00%. Comparing base (d1a55c9) to head (9db30fb).

Files Patch % Lines
pkg/cli/azure/client_mock.go 50.00% 30 Missing ⚠️
pkg/cli/aws/client_mock.go 50.00% 12 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7647      +/-   ##
==========================================
- Coverage   61.02%   61.00%   -0.02%     
==========================================
  Files         518      518              
  Lines       26557    26627      +70     
==========================================
+ Hits        16207    16245      +38     
- Misses       8918     8955      +37     
+ Partials     1432     1427       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@superbeeny superbeeny temporarily deployed to functional-tests May 30, 2024 19:19 — with GitHub Actions Inactive
@radius-functional-tests
Copy link
Copy Markdown

radius-functional-tests Bot commented May 30, 2024

Radius functional test overview

🔍 Go to test action run

Name Value
Repository superbeeny/radius
Commit ref be3732a
Unique ID func3b630be337
Image tag pr-func3b630be337
Click here to see the list of tools in the current test run
  • gotestsum 1.10.0
  • KinD: v0.20.0
  • Dapr: 1.12.0
  • Azure KeyVault CSI driver: 1.4.2
  • Azure Workload identity webhook: 1.1.0
  • Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func3b630be337
  • Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
  • applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-func3b630be337
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-func3b630be337
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func3b630be337
  • deployment-engine test image location: ghcr.io/radius-project/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting daprrp functional tests...
⌛ Starting shared functional tests...
⌛ Starting cli functional tests...
⌛ Starting samples functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting ucp functional tests...
⌛ Starting datastoresrp functional tests...
✅ kubernetes functional tests succeeded
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ cli functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ shared functional tests succeeded

lakshmimsft
lakshmimsft previously approved these changes May 30, 2024
Copy link
Copy Markdown
Member

@kachawla kachawla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this @superbeeny!

Comment thread pkg/cli/clients/management_mocks.go Outdated
Co-authored-by: Karishma Chawla <kachawla@microsoft.com>
Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
@superbeeny superbeeny temporarily deployed to functional-tests June 3, 2024 12:58 — with GitHub Actions Inactive
@radius-functional-tests
Copy link
Copy Markdown

radius-functional-tests Bot commented Jun 3, 2024

Radius functional test overview

🔍 Go to test action run

Name Value
Repository superbeeny/radius
Commit ref 8322fa3
Unique ID func591bd01fd5
Image tag pr-func591bd01fd5
Click here to see the list of tools in the current test run
  • gotestsum 1.10.0
  • KinD: v0.20.0
  • Dapr: 1.12.0
  • Azure KeyVault CSI driver: 1.4.2
  • Azure Workload identity webhook: 1.1.0
  • Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func591bd01fd5
  • Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
  • applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-func591bd01fd5
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-func591bd01fd5
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func591bd01fd5
  • deployment-engine test image location: ghcr.io/radius-project/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting datastoresrp functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting cli functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting samples functional tests...
⌛ Starting shared functional tests...
✅ msgrp functional tests succeeded
✅ kubernetes functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ daprrp functional tests succeeded
✅ ucp functional tests succeeded
✅ samples functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

@ytimocin
Copy link
Copy Markdown
Contributor

ytimocin commented Jun 3, 2024

Thanks for your contribution @superbeeny! You should run make generate in your local and then commit the generated changes.

@superbeeny superbeeny temporarily deployed to functional-tests June 3, 2024 13:49 — with GitHub Actions Inactive
@radius-functional-tests
Copy link
Copy Markdown

radius-functional-tests Bot commented Jun 3, 2024

Radius functional test overview

🔍 Go to test action run

Name Value
Repository superbeeny/radius
Commit ref f8a82b7
Unique ID funcab84c4c766
Image tag pr-funcab84c4c766
Click here to see the list of tools in the current test run
  • gotestsum 1.10.0
  • KinD: v0.20.0
  • Dapr: 1.12.0
  • Azure KeyVault CSI driver: 1.4.2
  • Azure Workload identity webhook: 1.1.0
  • Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-funcab84c4c766
  • Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
  • applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-funcab84c4c766
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-funcab84c4c766
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-funcab84c4c766
  • deployment-engine test image location: ghcr.io/radius-project/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting msgrp functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting samples functional tests...
⌛ Starting ucp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting shared functional tests...
⌛ Starting datastoresrp functional tests...
⌛ Starting cli functional tests...
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ kubernetes functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

@ytimocin
Copy link
Copy Markdown
Contributor

ytimocin commented Jun 3, 2024

One last thing :) DCO is failing: https://github.com/radius-project/radius/pull/7647/checks?check_run_id=25736485013. You should sign your commit. I guess, if you do git commit -s --amend and push all the changes again, it should be signed. Thanks @superbeeny!

@superbeeny
Copy link
Copy Markdown
Contributor Author

One last thing :) DCO is failing: https://github.com/radius-project/radius/pull/7647/checks?check_run_id=25736485013. You should sign your commit. I guess, if you do git commit -s --amend and push all the changes again, it should be signed. Thanks @superbeeny!

It's the tracking branch merge that I'm guessing is causing the issue the commit before it is signed :(

@superbeeny
Copy link
Copy Markdown
Contributor Author

There are days I really hate git 👎

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
@superbeeny superbeeny force-pushed the superbeeny/fixes7592 branch from e7ff963 to 0b7bc41 Compare June 3, 2024 15:21
@superbeeny superbeeny temporarily deployed to functional-tests June 3, 2024 15:31 — with GitHub Actions Inactive
@radius-functional-tests
Copy link
Copy Markdown

radius-functional-tests Bot commented Jun 3, 2024

Radius functional test overview

🔍 Go to test action run

Name Value
Repository superbeeny/radius
Commit ref 0b7bc41
Unique ID funcd3988862ad
Image tag pr-funcd3988862ad
Click here to see the list of tools in the current test run
  • gotestsum 1.10.0
  • KinD: v0.20.0
  • Dapr: 1.12.0
  • Azure KeyVault CSI driver: 1.4.2
  • Azure Workload identity webhook: 1.1.0
  • Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-funcd3988862ad
  • Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
  • applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-funcd3988862ad
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-funcd3988862ad
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-funcd3988862ad
  • deployment-engine test image location: ghcr.io/radius-project/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting datastoresrp functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting samples functional tests...
⌛ Starting shared functional tests...
⌛ Starting cli functional tests...
⌛ Starting kubernetes functional tests...
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ kubernetes functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

Copy link
Copy Markdown
Contributor

@ytimocin ytimocin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this change @superbeeny! 🚀

}, nil)

secondCall := mockCli.EXPECT().Dequeue(gomock.Any(), gomock.Any()).Return(nil, ErrInvalidMessage).After(firstCall)
secondCall := mockCli.EXPECT().Dequeue(gomock.Any(), gomock.Any()).Return(nil, ErrInvalidMessage).After(firstCall.Call)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is one of the changes that come with the mock updates, I guess.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are using this (second call should be after the first call test) only in this test.

@kachawla kachawla temporarily deployed to functional-tests June 3, 2024 23:43 — with GitHub Actions Inactive
@radius-functional-tests
Copy link
Copy Markdown

radius-functional-tests Bot commented Jun 3, 2024

Radius functional test overview

🔍 Go to test action run

Name Value
Repository superbeeny/radius
Commit ref 9db30fb
Unique ID func39dcd008ba
Image tag pr-func39dcd008ba
Click here to see the list of tools in the current test run
  • gotestsum 1.10.0
  • KinD: v0.20.0
  • Dapr: 1.12.0
  • Azure KeyVault CSI driver: 1.4.2
  • Azure Workload identity webhook: 1.1.0
  • Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func39dcd008ba
  • Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
  • applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-func39dcd008ba
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-func39dcd008ba
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func39dcd008ba
  • deployment-engine test image location: ghcr.io/radius-project/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting samples functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting shared functional tests...
⌛ Starting datastoresrp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting cli functional tests...
⌛ Starting ucp functional tests...
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ kubernetes functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

@lakshmimsft
Copy link
Copy Markdown
Contributor

Thanks @superbeeny. I'm merging this in.

@lakshmimsft lakshmimsft merged commit e3900e3 into radius-project:main Jun 4, 2024
sk593 pushed a commit that referenced this pull request Jun 4, 2024
# Description

Fixes issue #7592 - adding types to generated mocks

## Type of change

- This pull request fixes a bug in Radius and has an approved issue
#7592 .

Fixes: #7592

---------

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
Co-authored-by: Karishma Chawla <kachawla@microsoft.com>
sk593 pushed a commit that referenced this pull request Jun 4, 2024
# Description

Fixes issue #7592 - adding types to generated mocks

## Type of change

- This pull request fixes a bug in Radius and has an approved issue
#7592 .

Fixes: #7592

---------

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
Co-authored-by: Karishma Chawla <kachawla@microsoft.com>
sk593 pushed a commit that referenced this pull request Jun 4, 2024
# Description

Fixes issue #7592 - adding types to generated mocks

## Type of change

- This pull request fixes a bug in Radius and has an approved issue
#7592 .

Fixes: #7592

---------

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
Co-authored-by: Karishma Chawla <kachawla@microsoft.com>
sk593 pushed a commit to sk593/radius that referenced this pull request Jun 4, 2024
)

# Description

Fixes issue radius-project#7592 - adding types to generated mocks

## Type of change

- This pull request fixes a bug in Radius and has an approved issue
radius-project#7592 .

Fixes: radius-project#7592

---------

Signed-off-by: Nick Beenham <1985327+superbeeny@users.noreply.github.com>
Co-authored-by: Karishma Chawla <kachawla@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use typed mocks

4 participants