Skip to content

Commit

Permalink
2.9-LTS merge (#552)
Browse files Browse the repository at this point in the history
* [CORE-2.9-LTS] Upgrated access-control for LTS

* [CORE-2.9-LTS] Upgraded notification mail service for LTS

* [CORE-2.9-LTS] Fixed pom of access control service

* [CORE-2.9-LTS] Upgraded egov-idgen for LTS

* [CORE-2.9-LTS] Upgraded workflow service for TLS

* updated persister springboot version to 2.7.5

* [CORE-2.9-LTS] Upgraded audit service for LTS

* [CORE-2.9-LTS] Upgraded user-otp service for LTS

* Removed redundant dependencies in persister

* [CORE-2.9-LTS] Corrected postgres version in access control, workflow and audit service

* Updated postresSQL library version to 42.7.1 in persister

* [CORE-2.9-LTS] Upgraded audit service, location, egov-otp, localization, encryption and mdms services for LTS

* [CORE-2.9-LTS] Upgraded spring version in notification sms service

* [CORE-2.9-LTS] Upgraded postgres, spring-boot, flyway in
- audit-service
- egov-accesscontrol
- egov-idgen
- egov-localization
- egov-notification-mail
- egov-persister
- egov-url-shortening
- egov-workflow-v2
- service-request

* [CORE-2.9-LTS] Commented out PMD plugin in egov-notif-mail

* Revert "[CORE-2.9-LTS] Commented out PMD plugin in egov-notif-mail"

This reverts commit 9186642.

* [CORE-2.9-LTS] Corrected imports and added versions in core services

* [CORE-2.9-LTS] Upgraded spring boot version in enc client, mdms client and services common library

* [CORE-2.9-LTS] Upgraded user service for LTS

* Update Flyway version in Dockerfile

* Add echo statements to display Flyway parameters

* Fix migration script

* Remove baselineOnMigrate flag from migrate.sh script

* Update migrate.sh script

* Update Dockerfile CMD command

* Update Dockerfile CMD to use ENTRYPOINT

* Update migrate.sh script with additional flyway options

* [CORE-2.9-LTS] Cherry picked commits from tracer upgrade branch (#298)

* Updated Springboot, PostgresSQL and Flyway version in filestore

* Changed code to remove deprecated functions in tracer

* Temporary changes in tracer for springboot 3.0 upgrade

* Removed test cases temporarily and remove IOUtils

* Made changes to POM for compilation

* Updated env variable to pusblish error

* Moved DeadLetterQueueConfiguration in kafka folder

* [CORE-2.9-LTS] Upgraded service request to spring boot 3.2

---------

Co-authored-by: talele08 <[email protected]>

* [CORE-2.9-LTS] Upgraded audit service to spring 3.2

* [CORE-2.9-LTS] Upgraded access control service to spring 3.2

* [CORE-2.9-LTS] Upgraded enc service to spring 3.2.2

* [CORE-2.9-LTS] Upgraded idgen service to spring boot 3.2.2

* [CORE-2.9-LTS] Upgraded localization service to spring boot 3.2.2

* Updated springboot version in user-otp

* [CORE-2.9-LTS] Upgraded MDMS service to spring boot 3.2.2

* [CORE-2.9-LTS] Upgraded notification email service to spring boot 3.2.2

* [CORE-2.9-LTS] Upgraded sms notification service to spring boot 3.2.2

* [CORE-2.9-LTS] Upgraded egov-otp to spring boot 3.0

* Upgraded springboot version in url shortening to 3.2.2

* Updated springboot version in egov-workflow-v2 to 3.2.2

* Moved Error models from tracer to service-common (#297)

* [CORE-2.9-LTS] Added missing import in url shortening service

* [CORE-2.9-LTS] Upgraded filestore to spring 3.2.2

* [CORE-2.9-LTS] Pushing updated versions of tracer and services common

* Updated tracer 2.1.4

* Updated persister to springboot 3.0

* [CORE-2.9-LTS] Upgraded indexer service for LTS

* [CORE-2.9-LTS] Upgraded services common and tracer for 2.9-LTS

* Update Dockerfile for egov-user (#301)

* Update migrate.sh (#302)

* Update migrate.sh (#303)

* [CORE-2.9-LTS] Made fixes in user service model and updated pom to point to upgraded libraries

* [CORE-2.9-LTS] Upgraded tracer and removed services common library in audit service

* Updated pg-service to springboot 3.0

* [CORE-2.9-LTS] Upgraded libraries and made changes in services to accept upgraded versions of libraries

* [CORE-2.9-LTS] Bumped library versions in audit service

* [CORE-2.9-LTS] Upgraded access control service and bumped library versions

* [CORE-2.9-LTS] Upgraded library versions in encryption service

* [CORE-2.9-LTS] Upgraded libraries in filestore service

* [CORE-2.9-LTS] Upgraded libraries in idgen service

* [CORE-2.9-LTS] Upgraded libraries in localization service

* [CORE-2.9-LTS] Upgraded libraries in location service

* [CORE-2.9-LTS] Upgraded libraries in MDMS service

* [CORE-2.9-LTS] Upgraded versions in notification mail

* [CORE-2.9-LTS] Upgraded notification sms service

* [CORE-2.9-LTS] Upgraded egov-otp with updated libraries

* [CORE-2.9-LTS] Upgraded url shortening

* [CORE-2.9-LTS] Corrected url shortening test cases

* [CORE-2.9-LTS] Upgraded workflow service

* [CORE-2.9-LTS] Upgraded libraries in service request

* [CORE-2.9-LTS] Upgraded user otp with latest libraries

* [CORE-2.9-LTS] Upgraded indexer service

* [CORE-2.9-LTS] Fixed container pausing and resuming logic in indexer

* [CORE-2.9-LTS] Enhanced container pause and resume capabilities

* [CORE-2.9-LTS] Upgraded libraries in persister service

* [CORE-2.9-LTS] Updated jdk image

* [CORE-2.9-LTS] Updated base image

* [CORE-2.9-LTS] Updated docker file

* [CORE-2.9-LTS] Updated docker files for libraries

* Updated dockerfile for libraries

* Added distribution management in tracer

* Added build config for mdms-client

* Updated distribution management of mdms client

* Updated mdms client pom

* Updated settings.xml of mdms client

* [CORE-2.9-LTS] Updated flyway in
- audit-service
- egov-accesscontrol
- egov-filestore
- egov-idgen
- egov-localization
- egov-location
- egov-otp
- egov-url-shortening
- egov-wf-v2
- service-req

* [CORE-2.9-LTS] removed missingMigration flag in audit-service

* [CORE-2.9-LTS] removed missingMigration flag in
- access-control
- filestore
- localization
- location
- wf-v2
- service-req

* [CORE-2.9-LTS] updated the migration script for wf-v2

* [CORE-2.9-LTS] Removed circular dependencies from sms service

* [CORE-2.9-LTS] Updated pom of core services

* Updated java version in egov otp

* Updated java version in service request

* Temporary changes in dockerfile to check image size

* Changed base jdk image back to amazon coretto

* [CORE-2.9-LTS] Upgraded minio library version and made necessary code changes in filestore

* [CORE-2.9-LTS] Updated redis connection code in url shortening

* Removed unused import

* [CORE-2.9-LTS] Commented out URLRedisRepositoryTest

* [CORE-2.9-LTS] Corrected code of url redis repository

* [CORE-2.9-LTS] Corrected redis initialization logic in localization service

* [CORE-2.9-LTS] Upgraded HRMS service for LTS

* indexer-es-8-changes-with-authentication

* Update Dockerfile

* added comment to IndexerInfraApplication.java

* Update IndexerService.java

* Updated jobstore class in pg

* Updated paytm checksum library

* upgraded postgres lib version in pg service

* Update Dockerfile (#313)

* Moved Error models back to tracer

* Fix to nullpointer in tracer

* Correction to the getter method

* [core-2.9-lts] Added CHANGELOG for CORE-2.9-LTS

* Filestore2.9 (#320)

* Made changes to minio client in filestore

* Changed upload in thumbnail function

* Updated Apache Tika library in filestore

* [core-2.9-lts] Fixed javax in egov-wf

* [core-2.9-lts] Fixed javax in egov-enc

* Revert "[core-2.9-lts] Fixed javax in egov-wf"

This reverts commit db79f11.

* [core-2.9-lts] Fixed javax in egov-access

* [core-2.9-lts] Fixed javax in service-request

* [core-2.9-lts] Fixed javax in filestore

* [core-2.9-lts] Fixed javax in localization

* [core-2.9-lts] Fixed javax in egov-wf

* [core-2.9-lts] Added spring cloud gateway

* Added build config for Spring gateway

* Added build config for k8-discovery-code

* [core-2.9-lts] Added k8-discovery-script

* [core-2.9-lts] Added spring internal gateway

* Added build config for internal-gateway-scg

* [core-2.9-lts] Added egov-user-event

* [core-2.9-lts] Added maven-java8

* updated maven for egov-user

* birth-service-update (#334)

* birth-service-update

* updated-btr

* changes-migrate.sh file for hrms update (#351)

* [core-2.9-LTS] Removed Snapshot from the lib ver.

* Revert "[core-2.9-LTS] Removed Snapshot from the lib ver."

This reverts commit ae447a9.

* [core-2.9-lts] Deploying Zuul in LTS

* added search body for external uri mapping and handled null exception… (#324)

* added search body for external uri mapping and handled null exception in kafkacontainer

* changed the search body function in indexer

* changed the search body function in indexer

* changed reindex consumer config

* consumer-update

* Updated table name in EscalationQueryBuilder.java

Added missing underscore character in the table name in escalation query builder.

* Updated table name in EscalationQueryBuilderTest.java

Added missing underscore character in the table name in EscalationQueryBuilderTest.java

* fixed the reference thing for external api call (#414)

* fix search body bug

* fix search body bug

* fix search body bug

* Gateway filestore fix (#400)

* [core-2.9-lts] fix for filestore in gateway

* [core-2.9-lts] Fix to handle null reqBody

* Updated egov-workflow-v2 CHANGELOG.md (#416)

Added changelog with hotfix-2.9.1 tag in CHANGELOG.MD of egov-workflow-v2

* Updated CHANGELOG.md

Added HOTFIX tag to 2.9.1

* Added CHANGELOG.MD for gateway (#419)

Added CHANGELOG.MD file for gateway.

* [core-2.9-lts] upgraded mdms-v2 to LTS (#448)

* [core-2.9-lts] upgraded boundary-v2 to LTS (#449)

* [core-2.9-lts] Added boundary migration script (#450)

* Added mdms-migration-toolkit

* Removed Inbox from accelerators

* Schema Code bug fix

* Removed business service

* Updated the build config to as of master

* Removed api-spec & postman collection in tutorial

---------

Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: talele08 <[email protected]>
Co-authored-by: nikhilmulinti-egov <[email protected]>
Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: talele08 <[email protected]>
Co-authored-by: SriPadma8997-egov <[email protected]>
Co-authored-by: aaradhya-egov <[email protected]>
Co-authored-by: aaradhya-egov <[email protected]>
Co-authored-by: subhashini-egov <[email protected]>
Co-authored-by: varunreddy-egov <[email protected]>
Co-authored-by: Varun Reddy <[email protected]>
  • Loading branch information
12 people authored Sep 17, 2024
1 parent 2c6cba3 commit 063968a
Show file tree
Hide file tree
Showing 3,098 changed files with 57,254 additions and 182,531 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 31 additions & 0 deletions accelerators/gateway-kubernetes-discovery/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

FROM golang:1.13-alpine as build

ENV GO111MODULE=on
ENV GOCACHE=/tmp

ARG WORK_DIR
WORKDIR /app

COPY ${WORK_DIR}/go.mod .
COPY ${WORK_DIR}/go.sum .

RUN go mod download

COPY . .

RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build


# Create runtime image
FROM alpine:3

WORKDIR /opt/egov

RUN addgroup -S egov && adduser -S -G egov egov
COPY --chown=egov:egov --from=build /app/zuul-kubernetes-discovery /opt/egov/

RUN chmod +x /opt/egov/zuul-kubernetes-discovery

CMD ["/opt/egov/zuul-kubernetes-discovery"]
# USER egov
202 changes: 202 additions & 0 deletions accelerators/gateway-kubernetes-discovery/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
9 changes: 9 additions & 0 deletions accelerators/gateway-kubernetes-discovery/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/egovernments/utilities/zuul-kubernetes-discovery

go 1.13

require (
k8s.io/api v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
)
Loading

0 comments on commit 063968a

Please sign in to comment.