Skip to content

Commit

Permalink
Moving to saveourtool domain (omg) (#794)
Browse files Browse the repository at this point in the history
### What's done:
- updated packages
- updated deploy scripts
- updated links on the FE
  • Loading branch information
orchestr7 authored May 26, 2022
1 parent 036ecb1 commit ecc64e1
Show file tree
Hide file tree
Showing 328 changed files with 1,549 additions and 1,549 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: checkout save-core
uses: actions/checkout@v3
with:
repository: analysis-dev/save
repository: saveourtool/save
path: save
fetch-depth: 0
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion .run/save-backend not docker.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<envs>
<env name="SPRING_PROFILES_ACTIVE" value="dev" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.cqfn.save.backend.SaveApplicationKt" />
<option name="MAIN_CLASS_NAME" value="com.saveourtool.save.backend.SaveApplicationKt" />
<module name="save-cloud.save-backend.main" />
<method v="2">
<option name="Make" enabled="true" />
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 CQFN
Copyright (c) 2022 SaveOurTool

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
![Build and test](https://github.com/analysis-dev/save-cloud/workflows/Build%20and%20test/badge.svg)
[![License](https://img.shields.io/github/license/analysis-dev/save-cloud)](https://github.com/analysis-dev/save-cloud/blob/master/LICENSE)
[![codecov](https://codecov.io/gh/analysis-dev/save-cloud/branch/master/graph/badge.svg)](https://codecov.io/gh/analysis-dev/save-cloud)
![Build and test](https://github.com/saveourtool/save-cloud/workflows/Build%20and%20test/badge.svg)
[![License](https://img.shields.io/github/license/saveourtool/save-cloud)](https://github.com/saveourtool/save-cloud/blob/master/LICENSE)
[![codecov](https://codecov.io/gh/saveourtool/save-cloud/branch/master/graph/badge.svg)](https://codecov.io/gh/saveourtool/save-cloud)

## What is SAVE?
[SAVE](https://github.com/analysis-dev/save) (Software Analysis Verification & Evaluation) - is an eco-system for measuring, testing and certification of software tools. Instead of writing your test framework SAVE will provide you a command line application
[SAVE](https://github.com/saveourtool/save) (Software Analysis Verification & Evaluation) - is an eco-system for measuring, testing and certification of software tools. Instead of writing your test framework SAVE will provide you a command line application
and with a test sets for the language that you are developing analyzer/compiler/or any other dev-tool for.
It provides you also a cloud service that can be used to determine the readiness of your tool. SAVE has a committee of software analysis and system programming experts
that regularly update tests and discuss the best practices for particular programming languages.
Expand Down
4 changes: 2 additions & 2 deletions api-gateway/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.cqfn.save.buildutils.configureJacoco
import org.cqfn.save.buildutils.configureSpringBoot
import com.saveourtool.save.buildutils.configureJacoco
import com.saveourtool.save.buildutils.configureSpringBoot

import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.cqfn.save.gateway
package com.saveourtool.save.gateway

import org.cqfn.save.gateway.config.ConfigurationProperties
import com.saveourtool.save.gateway.config.ConfigurationProperties

import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cqfn.save.gateway.config
package com.saveourtool.save.gateway.config

import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.cqfn.save.gateway.controller
package com.saveourtool.save.gateway.controller

import org.cqfn.save.gateway.utils.userName
import org.cqfn.save.info.OauthProviderInfo
import org.cqfn.save.info.UserInfo
import com.saveourtool.save.gateway.utils.userName
import com.saveourtool.save.info.OauthProviderInfo
import com.saveourtool.save.info.UserInfo
import org.slf4j.LoggerFactory
import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository
import org.springframework.web.bind.annotation.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
* Configuration beans for security in different profiles
*/

package org.cqfn.save.gateway.security
package com.saveourtool.save.gateway.security

import org.cqfn.save.gateway.config.ConfigurationProperties
import org.cqfn.save.gateway.utils.StoringServerAuthenticationSuccessHandler
import org.cqfn.save.utils.IdentitySourceAwareUserDetails
import org.cqfn.save.utils.IdentitySourceAwareUserDetailsMixin
import com.saveourtool.save.gateway.config.ConfigurationProperties
import com.saveourtool.save.gateway.utils.StoringServerAuthenticationSuccessHandler
import com.saveourtool.save.utils.IdentitySourceAwareUserDetails
import com.saveourtool.save.utils.IdentitySourceAwareUserDetailsMixin

import com.fasterxml.jackson.databind.ObjectMapper
import org.springframework.context.annotation.Bean
Expand Down Expand Up @@ -113,7 +113,7 @@ class WebSecurityConfig(
.authenticated()
}
.and().run {
// FixMe: Properly support CSRF protection https://github.com/analysis-dev/save-cloud/issues/34
// FixMe: Properly support CSRF protection https://github.com/saveourtool/save-cloud/issues/34
csrf().disable()
}
.exceptionHandling {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Utility methods to work with authentication-related objects
*/

package org.cqfn.save.gateway.utils
package com.saveourtool.save.gateway.utils

import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
import org.springframework.security.core.Authentication
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cqfn.save.gateway.utils
package com.saveourtool.save.gateway.utils

import org.springframework.cloud.gateway.filter.GatewayFilter
import org.springframework.cloud.gateway.filter.GatewayFilterChain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.cqfn.save.gateway.utils
package com.saveourtool.save.gateway.utils

import org.cqfn.save.domain.Role
import org.cqfn.save.entities.User
import org.cqfn.save.gateway.config.ConfigurationProperties
import com.saveourtool.save.domain.Role
import com.saveourtool.save.entities.User
import com.saveourtool.save.gateway.config.ConfigurationProperties

import com.fasterxml.jackson.databind.ObjectMapper
import org.slf4j.LoggerFactory
Expand Down Expand Up @@ -36,7 +36,7 @@ class StoringServerAuthenticationSuccessHandler(
logger.info("Authenticated user ${authentication.userName()} with authentication type ${authentication::class}, will send data to backend")

val user = authentication.toUser().apply {
// https://github.com/analysis-dev/save-cloud/issues/583
// https://github.com/saveourtool/save-cloud/issues/583
// fixme: this sets a default role for a new user with minimal scope, however this way we discard existing role
// from authentication provider. In the future we may want to use this information and have a mapping of existing
// roles to save-cloud roles.
Expand Down
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import org.cqfn.save.buildutils.configureDetekt
import org.cqfn.save.buildutils.configureDiktat
import org.cqfn.save.buildutils.configureVersioning
import org.cqfn.save.buildutils.createDetektTask
import org.cqfn.save.buildutils.createStackDeployTask
import org.cqfn.save.buildutils.getDatabaseCredentials
import org.cqfn.save.buildutils.installGitHooks
import org.cqfn.save.buildutils.registerSaveCliVersionCheckTask
import com.saveourtool.save.buildutils.configureDetekt
import com.saveourtool.save.buildutils.configureDiktat
import com.saveourtool.save.buildutils.configureVersioning
import com.saveourtool.save.buildutils.createDetektTask
import com.saveourtool.save.buildutils.createStackDeployTask
import com.saveourtool.save.buildutils.getDatabaseCredentials
import com.saveourtool.save.buildutils.installGitHooks
import com.saveourtool.save.buildutils.registerSaveCliVersionCheckTask
import org.apache.tools.ant.taskdefs.condition.Os
import org.cqfn.save.buildutils.configurePublishing
import com.saveourtool.save.buildutils.configurePublishing

plugins {
alias(libs.plugins.talaiot.base)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.gradle.api.Project
import java.io.File
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration for detekt static analysis
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import io.gitlab.arturbosch.detekt.Detekt
import io.gitlab.arturbosch.detekt.DetektPlugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration for diktat static analysis
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.cqfn.diktat.plugin.gradle.DiktatExtension
import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin
Expand Down Expand Up @@ -40,7 +40,7 @@ private fun Project.fixDiktatTasks() {
javaLauncher.set(project.extensions.getByType<JavaToolchainService>().launcherFor {
languageVersion.set(JavaLanguageVersion.of(Versions.jdk))
})
// https://github.com/analysis-dev/diktat/issues/1269
// https://github.com/saveourtool/diktat/issues/1269
systemProperty("user.home", rootDir.toString())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration for docker swarm deployment
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.gradle.api.Project
import org.gradle.api.tasks.Exec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Gradle tasks to install git hooks as a part of the build
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.gradle.api.Project
import org.gradle.api.tasks.Copy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration for code coverage calculation via Jacoco
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Publishing configuration file.
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import io.github.gradlenexus.publishplugin.NexusPublishExtension
import io.github.gradlenexus.publishplugin.NexusPublishPlugin
Expand Down Expand Up @@ -74,7 +74,7 @@ private fun Project.configurePublications() {
publication.pom {
name.set(project.name)
description.set(project.description ?: project.name)
url.set("https://github.com/cqfn/save-cloud")
url.set("https://github.com/saveourtool/save-cloud")
licenses {
license {
name.set("MIT License")
Expand All @@ -95,8 +95,8 @@ private fun Project.configurePublications() {
}
}
scm {
url.set("https://github.com/cqfn/save-cloud")
connection.set("scm:git:git://github.com/cqfn/save-cloud.git")
url.set("https://github.com/saveourtool/save-cloud")
connection.set("scm:git:git://github.com/saveourtool/save-cloud.git")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration utilities for spring boot projects
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.accessors.dm.LibrariesForLibs
Expand Down Expand Up @@ -93,7 +93,7 @@ fun Project.configureSpringBoot(withSpringDataJpa: Boolean = false) {
}

tasks.named<BootBuildImage>("bootBuildImage") {
imageName = "ghcr.io/analysis-dev/${project.name}:${project.versionForDockerImages()}"
imageName = "ghcr.io/saveourtool/${project.name}:${project.versionForDockerImages()}"
environment = mapOf(
"BP_JVM_VERSION" to Versions.jdk,
"BPE_DELIM_JAVA_TOOL_OPTIONS" to " ",
Expand All @@ -106,7 +106,7 @@ fun Project.configureSpringBoot(withSpringDataJpa: Boolean = false) {
if (isPublish) {
docker {
publishRegistry {
username = "analysis-dev"
username = "saveourtool"
password = registryPassword
url = "https://ghcr.io"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration for project versioning
*/

package org.cqfn.save.buildutils
package com.saveourtool.save.buildutils

import org.ajoberstar.grgit.gradle.GrgitServiceExtension
import org.ajoberstar.grgit.gradle.GrgitServicePlugin
Expand Down Expand Up @@ -78,7 +78,7 @@ fun Project.registerSaveCliVersionCheckTask() {
findProperty("saveCliVersion") as String? ?: run {
// as fallback, use latest release to allow the project to build successfully
val latestRelease = ResourceGroovyMethods.getText(
URL("https://api.github.com/repos/analysis-dev/save/releases/latest")
URL("https://api.github.com/repos/saveourtool/save-cli/releases/latest")
)
(groovy.json.JsonSlurper().parseText(latestRelease) as Map<String, Any>)["tag_name"].let {
(it as String).trim('v')
Expand Down
2 changes: 1 addition & 1 deletion db/v-1/insert-test-data/git-insert.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<insert dbms="mysql" tableName="git">
<column name="id" value="2" />
<column name="url" value="https://github.com/analysis-dev/save-cloud" />
<column name="url" value="https://github.com/saveourtool/save-cloud" />
<column name="username" value="kentr0w" />
<column name="password" value="pass" />
<column name="branch" value="feature/create-backend" />
Expand Down
2 changes: 1 addition & 1 deletion diktat-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: DIKTAT_COMMON
enabled: true
configuration:
domainName: org.cqfn.save
domainName: com.saveourtool.save
kotlinVersion: 1.5
srcDirectories: "main,nativeMain,linuxX64Main"
testDirs: "test,nativeTest,linuxX64Test"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ x-logging:
services:
orchestrator:
image: ghcr.io/analysis-dev/save-orchestrator:${TAG}
image: ghcr.io/saveourtool/save-orchestrator:${TAG}
user: root # to access host's docker socket
environment:
- "SPRING_PROFILES_ACTIVE=${PROFILE}"
Expand All @@ -35,7 +35,7 @@ services:
- "prometheus-job=save-orchestrator"
logging: *loki-logging-jvm
backend:
image: ghcr.io/analysis-dev/save-backend:${TAG}
image: ghcr.io/saveourtool/save-backend:${TAG}
environment:
- "SPRING_PROFILES_ACTIVE=${PROFILE},secure,docker-secrets"
- "MYSQL_USER=/run/secrets/db_username"
Expand All @@ -54,7 +54,7 @@ services:
- "prometheus-job=save-backend"
logging: *loki-logging-jvm
preprocessor:
image: ghcr.io/analysis-dev/save-preprocessor:${TAG}
image: ghcr.io/saveourtool/save-preprocessor:${TAG}
environment:
- "SPRING_PROFILES_ACTIVE=${PROFILE}"
volumes:
Expand All @@ -72,7 +72,7 @@ services:
max_attempts: 3
logging: *loki-logging-jvm
gateway:
image: ghcr.io/analysis-dev/api-gateway:${TAG}
image: ghcr.io/saveourtool/api-gateway:${TAG}
environment:
- "SPRING_PROFILES_ACTIVE=${PROFILE}"
ports:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group=org.cqfn.save
group=com.saveourtool.save
liquibaseTaskPrefix=liquibase
# gradle performance
org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m
Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,21 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlin-plugin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" }
kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
diktat = { id = "org.cqfn.diktat.diktat-gradle-plugin", version.ref = "diktat" }
diktat = { id = "com.cqfn.diktat.diktat-gradle-plugin", version.ref = "diktat" }
liquibase-gradle = { id = "org.liquibase.gradle", version = "2.1.1" }
talaiot-base = { id = "com.cdsap.talaiot.plugin.base", version = "1.4.2" }
download = { id = "de.undercouch.download", version = "5.1.0" }

[libraries]
save-common = { module = "org.cqfn.save:save-common", version.ref = "save-core" }
save-common-jvm = { module = "org.cqfn.save:save-common-jvm", version.ref = "save-core" }
save-core = { module = "org.cqfn.save:save-core", version.ref = "save-core" }
save-core-jvm = { module = "org.cqfn.save:save-core-jvm", version.ref = "save-core" }
save-plugins-fix = { module = "org.cqfn.save:fix-plugin", version.ref = "save-core" }
save-plugins-fix-jvm = { module = "org.cqfn.save:fix-plugin-jvm", version.ref = "save-core" }
save-plugins-warn-jvm = { module = "org.cqfn.save:warn-plugin-jvm", version.ref = "save-core" }
save-plugins-fixAndWarn-jvm = { module = "org.cqfn.save:fix-and-warn-plugin-jvm", version.ref = "save-core" }
save-reporters = { module = "org.cqfn.save:save-reporters", version.ref = "save-core" }
save-common = { module = "com.saveourtool.save:save-common", version.ref = "save-core" }
save-common-jvm = { module = "com.saveourtool.save:save-common-jvm", version.ref = "save-core" }
save-core = { module = "com.saveourtool.save:save-core", version.ref = "save-core" }
save-core-jvm = { module = "com.saveourtool.save:save-core-jvm", version.ref = "save-core" }
save-plugins-fix = { module = "com.saveourtool.save:fix-plugin", version.ref = "save-core" }
save-plugins-fix-jvm = { module = "com.saveourtool.save:fix-plugin-jvm", version.ref = "save-core" }
save-plugins-warn-jvm = { module = "com.saveourtool.save:warn-plugin-jvm", version.ref = "save-core" }
save-plugins-fixAndWarn-jvm = { module = "com.saveourtool.save:fix-and-warn-plugin-jvm", version.ref = "save-core" }
save-reporters = { module = "com.saveourtool.save:save-reporters", version.ref = "save-core" }

kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-plugin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
Expand Down
Loading

0 comments on commit ecc64e1

Please sign in to comment.