Skip to content

Commit

Permalink
Refactor project: rename from BeehiveManager to Beehive
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm360 committed Dec 2, 2024
1 parent 7d2fcb5 commit d8545c5
Show file tree
Hide file tree
Showing 174 changed files with 611 additions and 631 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: etherna/beehive-manager
images: etherna/beehive
tags: |
type=semver,pattern=v{{major}}
type=semver,pattern=v{{major}}.{{minor}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unstable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: etherna/beehive-manager
images: etherna/beehive
tags: |
type=ref,event=branch
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions .idea/.idea.Beehive/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion .idea/.idea.BeehiveManager/.idea/.name

This file was deleted.

10 changes: 5 additions & 5 deletions BeehiveManager.sln → Beehive.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager", "src\BeehiveManager\BeehiveManager.csproj", "{E14D105A-A294-4F67-BC95-58C5178E2818}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beehive", "src\Beehive\Beehive.csproj", "{E14D105A-A294-4F67-BC95-58C5178E2818}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{61C3814F-A839-44D7-8335-0F365D3FFA8C}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -17,11 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1CD13F83-9A79-4873-A8E3-77A2D432D706}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Domain", "src\BeehiveManager.Domain\BeehiveManager.Domain.csproj", "{125AB1B7-31FD-4BA5-8282-6AC48C3522BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beehive.Domain", "src\Beehive.Domain\Beehive.Domain.csproj", "{125AB1B7-31FD-4BA5-8282-6AC48C3522BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Services", "src\BeehiveManager.Services\BeehiveManager.Services.csproj", "{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beehive.Services", "src\Beehive.Services\Beehive.Services.csproj", "{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Persistence", "src\BeehiveManager.Persistence\BeehiveManager.Persistence.csproj", "{74960F98-A78D-40A5-8CD1-20E05DB4DD35}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beehive.Persistence", "src\Beehive.Persistence\Beehive.Persistence.csproj", "{74960F98-A78D-40A5-8CD1-20E05DB4DD35}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2100F089-0589-448E-93E0-45B069DDCE64}"
EndProject
Expand All @@ -33,7 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-beehive-sample", "do
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE10A1ED-2695-44EC-97F1-CB91FC5412D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Persistence.Tests", "test\BeehiveManager.Persistence.Tests\BeehiveManager.Persistence.Tests.csproj", "{74F4D982-085D-42F4-9E61-C288B25E64CB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beehive.Persistence.Tests", "test\Beehive.Persistence.Tests\Beehive.Persistence.Tests.csproj", "{74F4D982-085D-42F4-9E61-C288B25E64CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9EEC390E-0D81-4379-A02A-C1A7B55CF431}"
ProjectSection(SolutionItems) = preProject
Expand Down
8 changes: 4 additions & 4 deletions BeehiveManager.sln.DotSettings → Beehive.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2021-present Etherna SA
This file is part of BeehiveManager.
This file is part of Beehive.

BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
Beehive is free software: you can redistribute it and/or modify it under the terms of the
GNU Affero General Public License as published by the Free Software Foundation,
either version 3 of the License, or (at your option) any later version.

BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
You should have received a copy of the GNU Affero General Public License along with Beehive.
If not, see &lt;https://www.gnu.org/licenses/&gt;.</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=etherna/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src
COPY . .
RUN dotnet restore "BeehiveManager.sln"
RUN dotnet build "BeehiveManager.sln" -c Release -o /app/build
RUN dotnet test "BeehiveManager.sln" -c Release
RUN dotnet restore "Beehive.sln"
RUN dotnet build "Beehive.sln" -c Release -o /app/build
RUN dotnet test "Beehive.sln" -c Release

FROM build AS publish
RUN dotnet publish "BeehiveManager.sln" -c Release -o /app/publish
RUN dotnet publish "Beehive.sln" -c Release -o /app/publish

FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "BeehiveManager.dll"]
ENTRYPOINT ["dotnet", "Beehive.dll"]
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Beehive Manager
# Beehive

## Overview

Beehive Manager is an utility for manage a cluster of [Bee Swarm](https://github.com/ethersphere/bee) nodes.
Beehive is a utility to manage a cluster of [Bee Swarm](https://github.com/ethersphere/bee) nodes.

This manager exposes a REST Api that permits to register and interact programmatically with different Bee nodes.
Beehive exposes a REST Api that permits to register and interact programmatically with different Bee nodes.
It runs also an async task engine that can run cron operations, like automatic scheduled cashout.

It uses a MongoDB instance for keep cluster configuration.

## Docker images

You can get latest stable and unstable releases from our [Docker Hub repository](https://hub.docker.com/r/etherna/beehive-manager).
You can get latest stable and unstable releases from our [Docker Hub repository](https://hub.docker.com/r/etherna/beehive).

You can find a sample on how to run with Docker Compose [here](samples/docker-beehive-sample)

Expand Down
4 changes: 2 additions & 2 deletions samples/docker-beehive-sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Execute the sample
==================

Environment has been built with `docker-compose`.
It created a MongoDB and a Beehive Manager instance with a dedicated shared network.
It created a MongoDB and a Beehive instance with a dedicated shared network.

Run it with:

Expand All @@ -19,7 +19,7 @@ Configuration

Application can be configured using environement variables:

* `ConnectionStrings__BeehiveManagerDb`: application's main db connection string
* `ConnectionStrings__BeehiveDb`: application's main db connection string
* `ConnectionStrings__HangfireDb`: async engine db connection string
* `ConnectionStrings__SystemDb`: system configuration db connection string

Expand Down
6 changes: 3 additions & 3 deletions samples/docker-beehive-sample/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version: "3.8"
services:

beehive-manager:
image: etherna/beehive-manager:latest
beehive:
image: etherna/beehive:latest
environment:
- ConnectionStrings__BeehiveManagerDb=mongodb://mongo/beehive # application db
- ConnectionStrings__BeehiveDb=mongodb://mongo/beehive # application db
- ConnectionStrings__DataProtectionDb=mongodb://mongo/beehiveDataProtection # system db
- ConnectionStrings__HangfireDb=mongodb://mongo/beehiveHangfire # async worker db
networks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Etherna.BeehiveManager.Domain</RootNamespace>
<RootNamespace>Etherna.Beehive.Domain</RootNamespace>

<Authors>Etherna SA</Authors>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using Etherna.BeehiveManager.Domain.Models;
using Etherna.Beehive.Domain.Models;
using Etherna.DomainEvents;

namespace Etherna.BeehiveManager.Domain.Events
namespace Etherna.Beehive.Domain.Events
{
public class SetBeeNodeAddressesEvent : IDomainEvent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using Etherna.BeehiveManager.Domain.Models;
using Etherna.Beehive.Domain.Models;
using Etherna.DomainEvents;
using Etherna.MongODM.Core;
using Etherna.MongODM.Core.Repositories;

namespace Etherna.BeehiveManager.Domain
namespace Etherna.Beehive.Domain
{
public interface IBeehiveDbContext : IDbContext
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using System;

namespace Etherna.BeehiveManager.Domain.Models
namespace Etherna.Beehive.Domain.Models
{
public class BeeNode : EntityModelBase<string>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using Etherna.DomainEvents;
using Etherna.MongODM.Core.Domain.Models;
using System;
using System.Collections.Generic;

namespace Etherna.BeehiveManager.Domain.Models
namespace Etherna.Beehive.Domain.Models
{
public abstract class EntityModelBase : ModelBase, IEntityModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using Etherna.MongODM.Core.Domain.Models;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;

namespace Etherna.BeehiveManager.Domain.Models
namespace Etherna.Beehive.Domain.Models
{
public abstract class ModelBase : IModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Copyright 2021-present Etherna SA
// This file is part of BeehiveManager.
// This file is part of Beehive.
//
// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
// Beehive is free software: you can redistribute it and/or modify it under the terms of the
// GNU Affero General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// Beehive is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
// You should have received a copy of the GNU Affero General Public License along with Beehive.
// If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Runtime.CompilerServices;

[assembly: CLSCompliant(false)]
[assembly: InternalsVisibleTo("BeehiveManager.Services")]
[assembly: InternalsVisibleTo("Beehive.Services")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Etherna.BeehiveManager.Persistence</RootNamespace>
<RootNamespace>Etherna.Beehive.Persistence</RootNamespace>

<Authors>Etherna SA</Authors>

Expand All @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BeehiveManager.Domain\BeehiveManager.Domain.csproj" />
<ProjectReference Include="..\Beehive.Domain\Beehive.Domain.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit d8545c5

Please sign in to comment.