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.

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

Cleanup : remove unused region geo location #524

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Cleanup : remove unused region geo location #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion docs/region-configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ See [regions.json](/onyxia-api/src/main/resources/regions.json) for a complete e
| `id` | Unique name of the region | "mycloud" |
| `name` | Descriptive name for the region | "mycloud region" |
| `description` | Description of the region | "This region is in an awesome cloud" |
| `location` | Geographical position of the data center on which the region is supposed to run. | {lat: 48.864716, longitude: 2.349014, name: "Paris" } |
| `includedGroupPattern` | Pattern of user groups considered for the user in the region. Patterns are case-sensitive. | ".*_Onyxia" |
| `excludedGroupPattern` | Pattern of user groups that will not be considered for the user in the region. Patterns are case-sensitive. | ".*_BadGroup" |
| `transformGroupPattern` | Indicate how to transform a group based on `includedGroupPattern` to make a project name used for a namespace or S3 bucket for example. For example with an `includedGroupPattern` of "(.*)_Onxyia" and a `transformGroupPattern` of "$1-k8s", a mygroup_Onyxia will generate a mygroup-k8s namespace. | "$1-k8s" |
Expand Down
5 changes: 0 additions & 5 deletions onyxia-api/src/main/resources/regions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@
},
"auth": {
"type": "openidconnect"
},
"location": {
"name": "Paris",
"lat": 48.8453225,
"long": 2.3024401
}
}
]
Expand Down
46 changes: 0 additions & 46 deletions onyxia-model/src/main/java/fr/insee/onyxia/model/region/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public class Region {
@Schema(description = "")
private String excludedGroupPattern;

@Schema(description = "")
private Location location;

@Schema(description = "")
private Services services = new Services();

Expand Down Expand Up @@ -105,14 +102,6 @@ public void setExcludedGroupPattern(String excludedGroupPattern) {
this.excludedGroupPattern = excludedGroupPattern;
}

public Location getLocation() {
return location;
}

public void setLocation(Location location) {
this.location = location;
}

public Services getServices() {
return services;
}
Expand Down Expand Up @@ -1077,41 +1066,6 @@ public void setPypiProxyUrl(String pypiProxyUrl) {
}
}

@Schema(description = "")
public static class Location {

private double lat;

@JsonProperty("long")
private double longitude;

private String name;

public double getLat() {
return lat;
}

public void setLat(double lat) {
this.lat = lat;
}

public double getLongitude() {
return longitude;
}

public void setLongitude(double longitude) {
this.longitude = longitude;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}
}

public static class Auth {
private String token;
private String username, password;
Expand Down