Skip to content
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.

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

chore(code): Upstream changes from Netflix #1951

Merged
merged 9 commits into from
Jun 23, 2021

Conversation

luispollo
Copy link
Contributor

Upstreaming the latest batch of changes from the Netflix fork.

emjburns and others added 9 commits June 23, 2021 10:22
Squashed commit of the following:

commit 046f4cb3637e80e64c21c61118e853172d733024
Author: Emily Burns <[email protected]>
Date:   Wed Jun 16 12:31:34 2021 -0700

    fix(mj): make mj not have a header

commit c2d68ed679680e55b9b021c4e76d7b41b3bc6f1e
Author: Emily Burns <[email protected]>
Date:   Wed Jun 16 11:21:24 2021 -0700

    fix(notifications): even smaller, no headers, mj

commit 237ca444226e3b4ffb801f65e8c13f72a4a8e467
Author: Emily Burns <[email protected]>
Date:   Tue Jun 15 20:40:14 2021 -0700

    feat(notifications): add compact notifications

(cherry picked from commit 9b39e64db7316044b6e8e2972dd9d5e0862891c4)
Squashed commit of the following:

commit e3fb199e7e8b105913cb6a56bdca90eb8fd3b07b
Author: Rani <[email protected]>
Date:   Tue Jun 15 14:08:29 2021 -0700

    fix(dgs): make tasks non-nullable

(cherry picked from commit 2d17a45e5c5e3b410dcc2d63636fc9bdc59e04c2)
… config import failed notification

Squashed commit of the following:

commit 483cc50de686478eeacae7fa0cdfa8ba01a0fece
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 10:48:31 2021 -0700

    fix(pr): Add missing indices, fix test

commit b21d781b3cc304fccf7a48a5192918c56b6af4f1
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 09:10:42 2021 -0700

    fix(notifications): Fixed GraphQL model

commit 4da9436f44f76889fbdd984726b47c166f98aa5c
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:52:09 2021 -0700

    feat(notifications): Add dismissedAt timestamp + renames

commit 184f2eec351190d7e65017d5577ff326edc5d801
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:32:19 2021 -0700

    chore(log): Add logging around dismissible notifications

commit 8507f476b4d3c59a609d871ae19199d20a67c778
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:27:59 2021 -0700

    fix(pr): Make SqlDismissibleNotificationRepository a @bean

commit 2dd5a946ee09cbd38d045bd00d8c43b8d0b8ec6f
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:04:39 2021 -0700

    chore(pr): More minor tweaks

commit b16a95c6c318b1b0064a5d9c791aa72a209d42f7
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 07:50:14 2021 -0700

    chore(pr): Minor tweaks

commit ebc430c5524fe7e676ed659dafeeac0d128eed07
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 07:39:25 2021 -0700

    fix(pr): Revert unrelated changes

commit 0d0c35594f5bb0cd0b99b18a492e4d3dbb7f8d5c
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 22:13:07 2021 -0700

    feat(scm): Generate dismissable notification for delivery config import failure

commit 5340fcc79e0cf6ad0c57c6980717554f0c281a94
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 22:12:42 2021 -0700

    feat(notifications): Add GraphQL support for dismissable notifications

commit 9a23bde5e499da3d658e98c34d298f9b22c38387
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 21:04:34 2021 -0700

    feat(notifications): Introduce dismissable notifications

(cherry picked from commit 0dfb4ab20f061f4041e96fc5cbf4ac284b824003)
We need to always pass desired capacity when cloning a server group, but not diff on it if there are scaling policies in play.

(cherry picked from commit 3f589263b46f536b0b0d187f517f52dc64b5eec7)
…tainers

Squashed commit of the following:

commit 9b49dbd4629a50db3f4653e39e68e5747fcf3be4
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 17:25:48 2021 -0700

    fix(test): Fix broken test

commit fcb29856c67b333c4d2f6cc5d7e88c2939cec46c
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 17:11:27 2021 -0700

    feat(verifications): Rename + test container endpoint vars

commit 3f38c0fa91967bfae2a254083f765247c7b3128b
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 09:39:55 2021 -0700

    feat(verifications): Add resource endpoints to verification test containers

(cherry picked from commit 63ad3de9e60015f70c67975c1e5b637601ade958)
(cherry picked from commit 832fc83064ac7dbeaa104837d488480c7b2c6df5)
(cherry picked from commit 8db40855f0a36c6048b907b0b1da2f80fc8e3ea2)
…e names

Squashed commit of the following:

commit e9d869220e4ad2b5b82c08e1fa438a39406f0e0d
Author: Luis Pollo <[email protected]>
Date:   Mon Jun 21 16:00:50 2021 -0700

    fix(tests): Fix tests

commit 876271571141db6550d655649facb22cc0d4b00b
Author: Luis Pollo <[email protected]>
Date:   Sat Jun 19 08:56:57 2021 -0700

    fix(network): Fix load balancer endpoint discovery + friendly resource names

(cherry picked from commit 1a15a7f17518d2f2590d9f68edc7eca3270a3613)
Squashed commit of the following:

commit c786e3f7471deb104b136c90ef7278eb9ee1652f
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:19:15 2021 +0300

    fix(dgs): convert level to enum

commit 2f8c17aed02b74609e59af6bede77dee75e4a277
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:15:53 2021 +0300

    fix(dgs): make notification objects non-nullable (but keep the array nullable)

(cherry picked from commit de9fc62364d5b79494c65d4c32d5d7a75e15d876)
@luispollo luispollo requested a review from a team June 23, 2021 17:22
@luispollo luispollo added the ready to merge Approved and ready for merge label Jun 23, 2021
@spinnakerbot
Copy link
Contributor

The following commits need their title changed:

  • dbac0ba: debug(caches): Add more debug logs to application cache

Please format your commit title into the form:

<type>(<scope>): <subject>, e.g. fix(kubernetes): address NPE in status check

This allows us to easily generate changelogs & determine semantic version numbers when cutting releases. You can read more about commit conventions here.

@mergify mergify bot merged commit 268960d into spinnaker:master Jun 23, 2021
@mergify mergify bot added the auto merged label Jun 23, 2021
@luispollo luispollo deleted the upstream-changes branch June 23, 2021 17:36
osoriano pushed a commit to osoriano/keel that referenced this pull request Sep 2, 2023
* feat(notifications): add compact notifications

Squashed commit of the following:

commit 046f4cb3637e80e64c21c61118e853172d733024
Author: Emily Burns <[email protected]>
Date:   Wed Jun 16 12:31:34 2021 -0700

    fix(mj): make mj not have a header

commit c2d68ed679680e55b9b021c4e76d7b41b3bc6f1e
Author: Emily Burns <[email protected]>
Date:   Wed Jun 16 11:21:24 2021 -0700

    fix(notifications): even smaller, no headers, mj

commit 237ca444226e3b4ffb801f65e8c13f72a4a8e467
Author: Emily Burns <[email protected]>
Date:   Tue Jun 15 20:40:14 2021 -0700

    feat(notifications): add compact notifications

(cherry picked from commit 9b39e64db7316044b6e8e2972dd9d5e0862891c4)

* fix(dgs): make task props non-nullable

Squashed commit of the following:

commit e3fb199e7e8b105913cb6a56bdca90eb8fd3b07b
Author: Rani <[email protected]>
Date:   Tue Jun 15 14:08:29 2021 -0700

    fix(dgs): make tasks non-nullable

(cherry picked from commit 2d17a45e5c5e3b410dcc2d63636fc9bdc59e04c2)

* feat(notifications): Add MdNotification to the GraphQL API + delivery config import failed notification

Squashed commit of the following:

commit 483cc50de686478eeacae7fa0cdfa8ba01a0fece
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 10:48:31 2021 -0700

    fix(pr): Add missing indices, fix test

commit b21d781b3cc304fccf7a48a5192918c56b6af4f1
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 09:10:42 2021 -0700

    fix(notifications): Fixed GraphQL model

commit 4da9436f44f76889fbdd984726b47c166f98aa5c
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:52:09 2021 -0700

    feat(notifications): Add dismissedAt timestamp + renames

commit 184f2eec351190d7e65017d5577ff326edc5d801
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:32:19 2021 -0700

    chore(log): Add logging around dismissible notifications

commit 8507f476b4d3c59a609d871ae19199d20a67c778
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:27:59 2021 -0700

    fix(pr): Make SqlDismissibleNotificationRepository a @bean

commit 2dd5a946ee09cbd38d045bd00d8c43b8d0b8ec6f
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 08:04:39 2021 -0700

    chore(pr): More minor tweaks

commit b16a95c6c318b1b0064a5d9c791aa72a209d42f7
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 07:50:14 2021 -0700

    chore(pr): Minor tweaks

commit ebc430c5524fe7e676ed659dafeeac0d128eed07
Author: Luis Pollo <[email protected]>
Date:   Thu Jun 17 07:39:25 2021 -0700

    fix(pr): Revert unrelated changes

commit 0d0c35594f5bb0cd0b99b18a492e4d3dbb7f8d5c
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 22:13:07 2021 -0700

    feat(scm): Generate dismissable notification for delivery config import failure

commit 5340fcc79e0cf6ad0c57c6980717554f0c281a94
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 22:12:42 2021 -0700

    feat(notifications): Add GraphQL support for dismissable notifications

commit 9a23bde5e499da3d658e98c34d298f9b22c38387
Author: Luis Pollo <[email protected]>
Date:   Wed Jun 16 21:04:34 2021 -0700

    feat(notifications): Introduce dismissable notifications

(cherry picked from commit 0dfb4ab20f061f4041e96fc5cbf4ac284b824003)

* fix(capacity): pass desired capacity to Orca but don't include in diff

We need to always pass desired capacity when cloning a server group, but not diff on it if there are scaling policies in play.

(cherry picked from commit 3f589263b46f536b0b0d187f517f52dc64b5eec7)

* feat(verifications): Pass resource endpoints to verification test containers

Squashed commit of the following:

commit 9b49dbd4629a50db3f4653e39e68e5747fcf3be4
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 17:25:48 2021 -0700

    fix(test): Fix broken test

commit fcb29856c67b333c4d2f6cc5d7e88c2939cec46c
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 17:11:27 2021 -0700

    feat(verifications): Rename + test container endpoint vars

commit 3f38c0fa91967bfae2a254083f765247c7b3128b
Author: Luis Pollo <[email protected]>
Date:   Fri Jun 18 09:39:55 2021 -0700

    feat(verifications): Add resource endpoints to verification test containers

(cherry picked from commit 63ad3de9e60015f70c67975c1e5b637601ade958)

* debug(caches): Add more debug logs to application cache

(cherry picked from commit 832fc83064ac7dbeaa104837d488480c7b2c6df5)

* fix(certs): segment certificate cache by account

(cherry picked from commit 8db40855f0a36c6048b907b0b1da2f80fc8e3ea2)

* fix(network): Fix load balancer endpoint discovery + friendly resource names

Squashed commit of the following:

commit e9d869220e4ad2b5b82c08e1fa438a39406f0e0d
Author: Luis Pollo <[email protected]>
Date:   Mon Jun 21 16:00:50 2021 -0700

    fix(tests): Fix tests

commit 876271571141db6550d655649facb22cc0d4b00b
Author: Luis Pollo <[email protected]>
Date:   Sat Jun 19 08:56:57 2021 -0700

    fix(network): Fix load balancer endpoint discovery + friendly resource names

(cherry picked from commit 1a15a7f17518d2f2590d9f68edc7eca3270a3613)

* fix(dgs): minor fixes in notifications query

Squashed commit of the following:

commit c786e3f7471deb104b136c90ef7278eb9ee1652f
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:19:15 2021 +0300

    fix(dgs): convert level to enum

commit 2f8c17aed02b74609e59af6bede77dee75e4a277
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:15:53 2021 +0300

    fix(dgs): make notification objects non-nullable (but keep the array nullable)

(cherry picked from commit de9fc62364d5b79494c65d4c32d5d7a75e15d876)

Co-authored-by: Emily Burns <[email protected]>
Co-authored-by: Rob Fletcher <[email protected]>
Co-authored-by: Rani Horev <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged ready to merge Approved and ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants